X Tutup
Skip to content

Commit 5514dc1

Browse files
robwormaldjelbourn
robwormald
authored and
jelbourn
committed
refactor(facade): use rxjs package
move to new RxJS distribution. BREAKING CHANGE: RxJS imports now are via `rxjs` instead of `@reactivex/rxjs` Individual operators can be imported `import 'rxjs/operators/map'`
1 parent a16ac84 commit 5514dc1

File tree

16 files changed

+42
-69
lines changed

16 files changed

+42
-69
lines changed

‎gulpfile.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ var BENCHPRESS_BUNDLE_CONFIG = {
146146
packageJson: './dist/js/cjs/benchpress/package.json',
147147
includes: ['angular2'],
148148
excludes: ['reflect-metadata', 'selenium-webdriver', 'zone.js'],
149-
ignore: ['@reactivex/rxjs'],
149+
ignore: [],
150150
dest: CONFIG.dest.benchpress_bundle
151151
};
152152

@@ -815,8 +815,7 @@ gulp.task('static-checks', ['!build.tools'], function(done) {
815815
// Make sure the two typings tests are isolated, by running this one in a tempdir
816816
var tmpdir = path.join(os.tmpdir(), 'test.typings', new Date().getTime().toString());
817817
gulp.task('!pre.test.typings.layoutNodeModule', ['build.js.cjs'], function() {
818-
return gulp.src(['dist/js/cjs/angular2/**/*', 'node_modules/@reactivex/rxjs/dist/cjs/**'],
819-
{base: 'dist/js/cjs'})
818+
return gulp.src(['dist/js/cjs/angular2/**/*', 'node_modules/rxjs/**'], {base: 'dist/js/cjs'})
820819
.pipe(gulp.dest(path.join(tmpdir, 'node_modules')));
821820
});
822821
gulp.task('!pre.test.typings.copyTypingsSpec', function() {
@@ -1152,9 +1151,11 @@ var JS_DEV_DEPS = [
11521151

11531152
// Splice in RX license if rx is in the bundle.
11541153
function insertRXLicense(source) {
1155-
var n = source.indexOf('System.register("@reactivex/rxjs/dist/cjs/Subject"');
1154+
var n = source.indexOf('System.register("rxjs/Subject"');
11561155
if (n >= 0) {
1157-
var rxLicense = licenseWrap('node_modules/@reactivex/rxjs/LICENSE.txt');
1156+
// TODO: point this to Rx once Rx includes license in dist
1157+
// https://github.com/angular/angular/issues/5558
1158+
var rxLicense = licenseWrap('LICENSE');
11581159
return source.slice(0, n) + rxLicense + source.slice(n);
11591160
} else {
11601161
return source;

‎karma-js.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function(config) {
2525
// Including systemjs because it defines `__eval`, which produces correct stack traces.
2626
'modules/angular2/src/testing/shims_for_IE.js',
2727
'node_modules/systemjs/dist/system.src.js',
28-
{pattern: 'node_modules/@reactivex/rxjs/**', included: false, watched: false, served: true},
28+
{pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true},
2929
'node_modules/reflect-metadata/Reflect.js',
3030
'tools/build/file2modulename.js',
3131
'test-main.js',

‎modules/angular2/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"repository": <%= JSON.stringify(packageJson.repository) %>,
1010
"dependencies": {
1111
"reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>",
12-
"@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
12+
"rxjs": "<%= packageJson.dependencies['rxjs'] %>",
1313
"zone.js": "<%= packageJson.dependencies['zone.js'] %>"
1414
},
1515
"devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>

‎modules/angular2/src/facade/async.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import {global, isPresent, noop} from 'angular2/src/facade/lang';
44
import {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise';
55
export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise';
66

7-
import {Subject} from '@reactivex/rxjs/dist/cjs/Subject';
8-
import {Observable as RxObservable} from '@reactivex/rxjs/dist/cjs/Observable';
9-
import {Subscription} from '@reactivex/rxjs/dist/cjs/Subscription';
10-
import {Operator} from '@reactivex/rxjs/dist/cjs/Operator';
11-
export {Subject} from '@reactivex/rxjs/dist/cjs/Subject';
7+
import {Subject} from 'rxjs/Subject';
8+
import {Observable as RxObservable} from 'rxjs/Observable';
9+
import {Subscription} from 'rxjs/Subscription';
10+
import {Operator} from 'rxjs/Operator';
11+
12+
import 'rxjs/observable/fromPromise';
13+
import 'rxjs/operators/toPromise';
14+
15+
export {Subject} from 'rxjs/Subject';
16+
1217

1318

1419
export namespace NodeJS {

‎modules/angular2/src/http/backends/mock_backend.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import {ReadyStates} from '../enums';
55
import {Connection, ConnectionBackend} from '../interfaces';
66
import {isPresent} from 'angular2/src/facade/lang';
77
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
8-
import {Subject, ReplaySubject} from '@reactivex/rxjs/dist/cjs/Rx';
8+
import {Subject} from 'rxjs/Subject';
9+
import {ReplaySubject} from 'rxjs/subjects/ReplaySubject';
910

1011
/**
1112
*

‎modules/angular2/src/http/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"repository": <%= JSON.stringify(packageJson.repository) %>,
1010
"dependencies": {
1111
"angular2": "<%= packageJson.version %>",
12-
"@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
12+
"rxjs": "<%= packageJson.dependencies['rxjs'] %>",
1313
"reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>"
1414
},
1515
"devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>

‎modules/angular2/test/http/http_spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import {
2929
Http,
3030
Jsonp
3131
} from 'angular2/http';
32-
import {Observable, Subject} from '@reactivex/rxjs/dist/cjs/Rx';
32+
import {Observable} from 'rxjs/Observable';
33+
import {Subject} from 'rxjs/Subject';
3334

3435
class SpyObserver extends SpyObject {
3536
onNext: Function;

‎modules/angular2/test/public_api_spec.ts‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -689,47 +689,12 @@ var NG_ALL = [
689689
'EventEmitter.emit():js',
690690
'Observable:js',
691691
'Observable#create():js',
692-
'Observable.buffer():js',
693-
'Observable.bufferCount():js',
694-
'Observable.bufferTime():js',
695-
'Observable.bufferToggle():js',
696-
'Observable.bufferWhen():js',
697-
'Observable.catch():js',
698-
'Observable.combineAll():js',
699-
'Observable.combineLatest():js',
700-
'Observable.concat():js',
701-
'Observable.concatAll():js',
702-
'Observable.concatMap():js',
703-
'Observable.concatMapTo():js',
704-
'Observable.count():js',
705-
'Observable.debounce():js',
706-
'Observable.debounceTime():js',
707-
'Observable.defaultIfEmpty():js',
708-
'Observable.delay():js',
709-
'Observable.dematerialize():js',
710-
'Observable.distinctUntilChanged():js',
711-
'Observable.do():js',
712-
'Observable.every():js',
713-
'Observable.expand():js',
714-
'Observable.filter():js',
715-
'Observable.finally():js',
716-
'Observable.first():js',
717-
'Observable.flatMap():js',
718-
'Observable.flatMapTo():js',
719692
'Observable.forEach():js',
720-
'Observable.groupBy():js',
721-
'Observable.ignoreElements():js',
722-
'Observable.last():js',
693+
'Observable#fromPromise():js',
723694
'Observable.lift():js',
724-
'Observable.map():js',
725-
'Observable.mapTo():js',
726-
'Observable.materialize():js',
727-
'Observable.merge():js',
728-
'Observable.mergeAll():js',
729-
'Observable.mergeMap():js',
730-
'Observable.mergeMapTo():js',
731-
'Observable.multicast():js',
732-
'Observable.observeOn():js',
695+
'Observable.subscribe():js',
696+
'Observable.take():js',
697+
'Observable.toPromise():js',
733698

734699
'OutputMetadata',
735700
'OutputMetadata.bindingPropertyName',

‎modules/angular2_material/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"repository": <%= JSON.stringify(packageJson.repository) %>,
1010
"dependencies": {
1111
"angular2": "<%= packageJson.version %>",
12-
"@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
12+
"rxjs": "<%= packageJson.dependencies['rxjs'] %>",
1313
"zone.js": "<%= packageJson.dependencies['zone.js'] %>"
1414
},
1515
"devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>

‎npm-shrinkwrap.clean.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"dependencies": {
3-
"@reactivex/rxjs": {
4-
"version": "5.0.0-alpha.10"
5-
},
63
"angular": {
74
"version": "1.4.7"
85
},
@@ -13184,6 +13181,9 @@
1318413181
}
1318513182
}
1318613183
},
13184+
"rxjs": {
13185+
"version": "5.0.0-alpha.11"
13186+
},
1318713187
"selenium-webdriver": {
1318813188
"version": "2.48.2",
1318913189
"dependencies": {

0 commit comments

Comments
 (0)
X Tutup