Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 2f39734

Browse files
committed
fix(bundle): make RxJS load from bundle instead of file-by-file
Part of #31
1 parent bf12c5a commit 2f39734

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/client/app.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import 'rxjs/add/operator/filter';
1111
import 'rxjs/add/operator/take';
1212
import 'rxjs/add/operator/concat';
1313
import 'rxjs/add/operator/switchMap';
14+
import 'rxjs/add/operator/map';
15+
import 'rxjs/add/operator/distinctUntilChanged';
1416

1517
import {IssueCliApp} from './app/issue-cli';
1618
import {FB_URL, IS_PRERENDER, IS_POST_LOGIN} from './app/config';

src/client/app/issue-cli.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import {MD_CARD_DIRECTIVES} from '@angular2-material/card';
66
import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav';
77
import {MdButton} from '@angular2-material/button';
88
import {MdProgressCircle} from '@angular2-material/progress-circle';
9-
import {Observable} from 'rxjs';
9+
import {Observable} from 'rxjs/Observable';
10+
import {ArrayObservable} from 'rxjs/observable/ArrayObservable';
1011
import {Issues} from './issues/issues';
1112
import {Login} from './login/login';
1213
import {IS_PRERENDER, IS_POST_LOGIN} from './config';
@@ -119,7 +120,7 @@ export class IssueCliApp {
119120
if (!isPrerender) {
120121
// If the page was part of the Firebase OAuth flow (the successful login redirect),
121122
// then short-circuit the auth observable.
122-
Observable.of(isPostLogin)
123+
ArrayObservable.of(isPostLogin)
123124
.filter(v => v === true)
124125
.concat(af.auth)
125126
// Cast nulls to booleans

src/client/system.config.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ System.config({
22
map: {
33
angularfire2: 'vendor/angularfire2',
44
firebase: 'vendor/firebase/lib',
5-
rxjs: 'vendor/rxjs',
65
'@angular2-material': 'vendor/@angular2-material'
76
},
87
packages: {
@@ -20,11 +19,6 @@ System.config({
2019
format: 'cjs',
2120
main: 'firebase-web.js'
2221
},
23-
rxjs: {
24-
defaultExtension: 'js',
25-
format: 'cjs',
26-
main: 'Rx.js'
27-
},
2822
'@angular2-material/core': {
2923
format: 'cjs',
3024
defaultExtension: 'js',

0 commit comments

Comments
 (0)