chore(merge): merge commit to fix TypeScript

Fix typescript (continuation of PR 11 and 12)

.babelrc

@@ -1,4 +1,3 @@
 {
-  "presets": ["es2015"],
-  "plugins": ["add-module-exports"],
+  "presets": ["es2015"]
 }

.gitignore

@@ -1,2 +1,3 @@
 node_modules
 lib
+ts-test/test.js

es/index.js

@@ -1,11 +1,12 @@
 /* global window */
 import ponyfill from './ponyfill';
 
-let root = this;
+var root = this;
 if (typeof global !== 'undefined') {
 	root = global;
 } else if (typeof window !== 'undefined') {
 	root = window;
 }
 
-export default ponyfill(root);
+var result = ponyfill(root);
+export default result;

index.d.ts

@@ -1,2 +1,2 @@
 declare const observableSymbol: symbol;
-export = observableSymbol;
+export default observableSymbol;

package.json

@@ -12,8 +12,8 @@
     "node": ">=0.10.0"
   },
   "scripts": {
+    "test": "npm run build && mocha && tsc ./ts-test/test.ts && node ./ts-test/test.js",
     "build": "babel es --out-dir lib",
-    "test": "npm run build && mocha",
     "prepublish": "npm test"
   },
   "files": [
@@ -37,9 +37,9 @@
   ],
   "devDependencies": {
     "babel-cli": "^6.9.0",
-    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-es2015": "^6.9.0",
     "chai": "^3.5.0",
-    "mocha": "^2.4.5"
+    "mocha": "^2.4.5",
+    "typescript": "^1.8.10"
   }
 }

test/index.js

@@ -1,6 +1,6 @@
 /* global describe, it */
 var expect = require('chai').expect;
-var $$observable = require('../');
+var $$observable = require('../').default;
 
 describe('integration test', function () {
 	if (typeof Symbol === 'function') {

test/ponyfill.js

@@ -1,6 +1,6 @@
 /* global describe, it */
 var expect = require('chai').expect;
-var ponyfill = require('../lib/ponyfill');
+var ponyfill = require('../lib/ponyfill').default;
 
 describe('ponyfill unit tests', function () {
   describe('when Symbol does NOT exist as a function', function () {

ts-test/test.ts

@@ -0,0 +1,10 @@
+import $$symbolObservable from '../';
+
+console.log('RUNNING TYPESCRIPT TEST...');
+
+if (typeof $$symbolObservable !== 'symbol' && <any>$$symbolObservable !== '@@observable') {
+  console.log('FAIL');
+  throw new Error('Sorry, $symbolObservable is ' + JSON.stringify($$symbolObservable));
+}
+
+console.log('PASS');