refactor(symbol-observable): bump up symbol-observable@1 (#1772)

resolves #1769

.gitignore

@@ -15,7 +15,7 @@ tmp/
 coverage/
 img/
 spec-js/
-.nyc-output/
+.nyc_output/
 
 # Misc
 npm-debug.log

package.json

@@ -152,7 +152,7 @@
     "coveralls": "^2.11.8",
     "cz-conventional-changelog": "1.1.6",
     "doctoc": "^1.0.0",
-    "esdoc": "^0.4.6",
+    "esdoc": "^0.4.7",
     "eslint": "^2.12.0",
     "fs-extra": "^0.30.0",
     "ghooks": "1.2.3",
@@ -162,13 +162,13 @@
     "gzip-size": "^3.0.0",
     "http-server": "^0.9.0",
     "lodash": "4.13.1",
-    "madge": "^0.5.3",
+    "madge": "^0.5.4",
     "markdown-doctest": "^0.7.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mocha": "2.5.3",
     "mocha-in-sauce": "0.0.1",
-    "npm-run-all": "2.1.1",
+    "npm-run-all": "^2.1.2",
     "npm-scripts-info": "^0.3.4",
     "nyc": "^6.6.1",
     "opn-cli": "^3.1.0",
@@ -180,11 +180,11 @@
     "sinon": "^2.0.0-pre",
     "sinon-chai": "^2.8.0",
     "source-map-support": "^0.4.0",
-    "systemjs": "^0.19.24",
-    "systemjs-builder": "^0.10.6",
+    "systemjs": "^0.19.31",
+    "systemjs-builder": "^0.15.23",
     "tslint": "^3.11.0",
     "typescript": "^1.8.10",
-    "typings": "^1.0.5",
+    "typings": "^1.2.0",
     "validate-commit-msg": "^2.3.1",
     "watch": "^0.18.0",
     "watchify": "3.7.0",
@@ -196,6 +196,6 @@
   },
   "typings": "./dist/cjs/Rx.d.ts",
   "dependencies": {
-    "symbol-observable": "^0.2.4"
+    "symbol-observable": "^1.0.1"
   }
 }

src/Observable.ts

@@ -6,7 +6,7 @@ import {root} from './util/root';
 import {toSubscriber} from './util/toSubscriber';
 import {IfObservable} from './observable/IfObservable';
 import {ErrorObservable} from './observable/ErrorObservable';
-import * as $$observable from 'symbol-observable';
+import $$observable from 'symbol-observable';
 
 export interface Subscribable<T> {
   subscribe(observerOrNext?: PartialObserver<T> | ((value: T) => void),

src/Rx.ts

@@ -170,7 +170,7 @@ import {QueueScheduler} from './scheduler/QueueScheduler';
 import {AnimationFrameScheduler} from './scheduler/AnimationFrameScheduler';
 import {$$rxSubscriber as rxSubscriber} from './symbol/rxSubscriber';
 import {$$iterator as iterator} from './symbol/iterator';
-import * as observable from 'symbol-observable';
+import observable from 'symbol-observable';
 
 /* tslint:enable:no-unused-variable */
 

src/observable/FromObservable.ts

@@ -13,7 +13,7 @@ import {Observable, ObservableInput} from '../Observable';
 import {Subscriber} from '../Subscriber';
 import {ObserveOnSubscriber} from '../operator/observeOn';
 
-import * as $$observable from 'symbol-observable';
+import $$observable from 'symbol-observable';
 
 const isArrayLike = (<T>(x: any): x is ArrayLike<T> => x && typeof x.length === 'number');
 

src/util/subscribeToResult.ts

@@ -8,7 +8,7 @@ import {Subscription} from '../Subscription';
 import {InnerSubscriber} from '../InnerSubscriber';
 import {OuterSubscriber} from '../OuterSubscriber';
 
-import * as $$observable from 'symbol-observable';
+import $$observable from 'symbol-observable';
 
 export function subscribeToResult<T, R>(outerSubscriber: OuterSubscriber<T, R>,
                                         result: any,

tools/make-system-bundle.js

@@ -3,25 +3,28 @@ var Builder = require('systemjs-builder');
 var addLicenseToFile = require('./add-license-to-file');
 
 var config = {
-  baseURL: 'dist',
   paths: {
-    'rxjs/*': 'cjs/*.js',
-    'symbol-observable': '../node_modules/symbol-observable/index.js',
-    'ponyfill': '../node_modules/symbol-observable/ponyfill.js'
-  }
-};
+    'rxjs/': 'dist/cjs/',
+    'symbol-observable/*': 'node_modules/symbol-observable/*',
+  },
+  packages: {
+    'symbol-observable': {
+      main: 'index.js'
+    }
+  },
 
-build('rxjs/Rx', '../dist/global/Rx.js', '../dist/global/Rx.min.js');
+  defaultJSExtensions: true,
+};
 
 function build(name, inputFile, outputFile) {
   var devBuilder = new Builder();
 
   devBuilder.config(config);
 
-  devBuilder.build(name, path.resolve(__dirname, inputFile)).then(function () {
+  devBuilder.bundle(name, path.resolve(__dirname, inputFile)).then(function () {
     var prodBuilder = new Builder();
     prodBuilder.config(config);
-    prodBuilder.build(name, path.resolve(__dirname, outputFile), {sourceMaps: true, minify: true}).then(function () {
+    prodBuilder.bundle(name, path.resolve(__dirname, outputFile), {sourceMaps: true, minify: true}).then(function () {
       process.exit(0);
     }, function (err) {
       console.error('prod died', err);
@@ -33,4 +36,6 @@ function build(name, inputFile, outputFile) {
   });
 }
 
+build('rxjs/Rx', '../dist/global/Rx.js', '../dist/global/Rx.min.js');
+
 process.stdin.resume();