Skip to content

Commit

Permalink
upgrading to rxjs beta 10.
Browse files Browse the repository at this point in the history
This entailed changing one import, change a bit the karma aliase. Now i also need to install rxjs-es as dev dependency because the es6 classes were split.
  • Loading branch information
david-gang committed Aug 3, 2016
1 parent 9717d40 commit f1af40c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function typescriptToES6(){
function buildES6Dist(){
let transpile = gulp.src('./dist/lib/**/*.js')
.pipe(filter(['**/*', '!**/*.spec.js']))
.pipe(replace('@reactivex/rxjs/dist/es6', '@reactivex/rxjs/dist/cjs'))
.pipe(replace('rxjs-es', 'rxjs'))
.pipe(gulp.dest('./dist/es6'));

let move = gulp.src('./dist/lib/**/*.d.ts')
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = function(config){
transform: [
['babelify', { stage: 0 }],
['aliasify', { aliases: {
'@reactivex/rxjs/dist/es6/Subject': '@reactivex/rxjs/dist/cjs/Subject'
'rxjs-es/Subject': 'rxjs/Subject'
}}]
]
},
Expand Down
2 changes: 1 addition & 1 deletion lib/events/event-emitter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Subject from '@reactivex/rxjs/dist/es6/Subject';
import {Subject} from 'rxjs-es/Subject';

/**
* Use by directives and components to emit custom Events. Copied from Angular 2's [EventEmitter](
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"license": "ISC",
"dependencies": {
"@reactivex/rxjs": "5.0.0-alpha.7",
"rxjs": "5.0.0-beta.10",
"reflect-metadata": "^0.1.2"
},
"devDependencies": {
Expand Down Expand Up @@ -69,6 +69,7 @@
"rollup": "^0.20.2",
"rollup-babel": "^0.6.1",
"run-sequence": "^1.1.4",
"rxjs-es": "5.0.0-beta.10",
"sinon": "^1.17.2",
"sinon-chai": "^2.8.0",
"tsd": "^0.6.5"
Expand Down

0 comments on commit f1af40c

Please sign in to comment.