Skip to content

Commit

Permalink
Merge branch 'master' of github.com:reactivex/rxjs
Browse files Browse the repository at this point in the history
  • Loading branch information
benlesh committed Mar 21, 2018
2 parents f4fb79e + 75331de commit f113b9d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .make-packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ let rootPackageJson = Object.assign({}, pkg, {
// functionality requires that the most broad mapping (rxjs/operators) be at
// the end of the alias mapping object. Created Webpack issue:
// https://github.com/webpack/webpack/issues/5870
const fileNames = klawSync(LEGACY_REEXPORT_ROOT, {
const fileNames = klawSync(ESM5_ROOT, {
nodir: true,
filter: function(item) {
return item.path.endsWith('.js');
}
})
.map(item => item.path)
.map(path => path.slice((`${__dirname}/${LEGACY_REEXPORT_ROOT}`).length))
.map(path => path.slice((`${__dirname}/${ESM5_ROOT}`).length))
.sort().reverse();

// Execute build optimizer transforms on ESM5 files
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"tslib": "^1.9.0"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.0.24",
"@angular-devkit/build-optimizer": "0.4.6",
"@types/chai": "4.1.2",
"@types/lodash": "4.14.102",
"@types/mocha": "2.2.48",
Expand Down
8 changes: 1 addition & 7 deletions src/internal/operators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,7 @@ export { skipLast } from './skipLast';
export { skipUntil } from './skipUntil';
export { skipWhile } from './skipWhile';
export { startWith } from './startWith';
/**
* TODO(https://github.com/ReactiveX/rxjs/issues/2900): Add back subscribeOn once it can be
* treeshaken. Currently if this export is added back, it
* forces apps to bring in asap scheduler along with
* Immediate, root, and other supporting code.
*/
// export { subscribeOn } from './subscribeOn';
export { subscribeOn } from './subscribeOn';
export { switchAll } from './switchAll';
export { switchMap } from './switchMap';
export { switchMapTo } from './switchMapTo';
Expand Down

0 comments on commit f113b9d

Please sign in to comment.