Skip to content

Commit c05005a

Browse files
josephperrottandrewseguin
authored andcommitted
chore: update to rxjs v6 beta and angular v6 beta (#10496)
1 parent d2067e7 commit c05005a

File tree

158 files changed

+508
-522
lines changed

Some content is hidden

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

158 files changed

+508
-522
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/tmp
66
/deploy
77
/screenshots
8+
/bazel-out
89

910
# Example module file will be auto-generated.
1011
/src/material-examples/example-module.ts

package-lock.json

Lines changed: 81 additions & 41 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
@@ -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": "6.0.0-rc.0",
30+
"@angular/common": "6.0.0-rc.0",
31+
"@angular/compiler": "6.0.0-rc.0",
32+
"@angular/core": "6.0.0-rc.0",
33+
"@angular/forms": "6.0.0-rc.0",
34+
"@angular/platform-browser": "6.0.0-rc.0",
3535
"core-js": "^2.4.1",
36-
"rxjs": "^5.5.7",
36+
"rxjs": "6.0.0-beta.1",
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",
4545
"@angular/bazel": "6.0.0-rc.0",
4646
"@angular/compiler-cli": "6.0.0-rc.0",
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",
47+
"@angular/http": "6.0.0-rc.0",
48+
"@angular/platform-browser-dynamic": "6.0.0-rc.0",
49+
"@angular/platform-server": "6.0.0-rc.0",
50+
"@angular/router": "6.0.0-rc.0",
51+
"@angular/upgrade": "6.0.0-rc.0",
5252
"@bazel/ibazel": "0.3.1",
5353
"@google-cloud/storage": "^1.1.1",
5454
"@schematics/angular": "^0.4.5",
@@ -127,7 +127,7 @@
127127
"tsconfig-paths": "^2.3.0",
128128
"tslint": "^5.9.1",
129129
"tsutils": "^2.6.0",
130-
"typescript": "~2.7.0",
130+
"typescript": "^2.7.2",
131131
"uglify-js": "^2.8.14",
132132
"web-animations-js": "^2.2.5"
133133
}

schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
22
import { BreakpointObserver, Breakpoints, BreakpointState } from '@angular/cdk/layout';
3-
import { Observable } from 'rxjs/Observable';
3+
import { Observable } from 'rxjs';
44

55
@Component({
66
selector: '<%= selector %>',<% if(inlineTemplate) { %>

schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import { merge } from 'rxjs/observable/merge';
2-
import { of as observableOf } from 'rxjs/observable/of';
31
import { DataSource } from '@angular/cdk/collections';
42
import { MatPaginator, MatSort } from '@angular/material';
5-
import { map } from 'rxjs/operators/map';
6-
import { Observable } from 'rxjs/Observable';
3+
import { map } from 'rxjs/operators';
4+
import { Observable, of as observableOf, merge } from 'rxjs';
75

86
// TODO: Replace this with your own data model type
97
export interface <%= classify(name) %>Item {

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/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ts_web_test(
4747
bootstrap = [
4848
"//:web_test_bootstrap_scripts",
4949
],
50-
50+
tags = ["manual"],
5151
# Do not sort
5252
deps = [
5353
"//:tslib_bundle",

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

0 commit comments

Comments
 (0)