Merge pull request #1761 from kwonoj/chore-dep

chore(package.json): bump up dependencies version

package.json

@@ -70,12 +70,12 @@
  "copy_src_cjs": "mkdirp ./dist/cjs/src && shx cp -r ./src/* ./dist/cjs/src",
  "copy_src_es6": "mkdirp ./dist/es6/src && shx cp -r ./src/* ./dist/es6/src",
  "commit": "git-cz",
- "compile_dist_amd": "tsc typings/main/ambient/es6-shim/index.d.ts ./dist/amd/src/Rx.ts ./dist/amd/src/add/observable/of.ts -m amd --sourceMap --outDir ./dist/amd --target ES5 --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
- "compile_dist_cjs": "tsc typings/main/ambient/es6-shim/index.d.ts ./dist/cjs/src/Rx.ts ./dist/cjs/src/add/observable/of.ts -m commonjs --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
+ "compile_dist_amd": "tsc typings/globals/es6-shim/index.d.ts ./dist/amd/src/Rx.ts ./dist/amd/src/add/observable/of.ts -m amd --sourceMap --outDir ./dist/amd --target ES5 --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
+ "compile_dist_cjs": "tsc typings/globals/es6-shim/index.d.ts ./dist/cjs/src/Rx.ts ./dist/cjs/src/add/observable/of.ts -m commonjs --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
  "compile_dist_es6": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts -m es2015 --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
  "compile_dist_es6_for_docs": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts ./dist/es6/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --suppressImplicitAnyIndexErrors --moduleResolution node",
  "cover": "npm-run-all cover_test cover_remapping",
- "cover_test": "shx rm -rf dist/cjs && tsc typings/main/ambient/es6-shim/index.d.ts src/Rx.ts src/add/observable/of.ts -m commonjs --outDir dist/cjs --sourceMap --target ES5 -d && istanbul cover -x \"spec-js/**/*\" -x \"mocha-setup-node.js\" ./node_modules/mocha/bin/_mocha -- --opts spec/support/default.opts spec-js",
+ "cover_test": "shx rm -rf dist/cjs && tsc typings/globals/es6-shim/index.d.ts src/Rx.ts src/add/observable/of.ts -m commonjs --outDir dist/cjs --sourceMap --target ES5 -d && istanbul cover -x \"spec-js/**/*\" -x \"mocha-setup-node.js\" ./node_modules/mocha/bin/_mocha -- --opts spec/support/default.opts spec-js",
  "cover_remapping": "remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.json && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.lcov -t lcovonly && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped -t html",
  "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..",
  "doctoc": "doctoc CONTRIBUTING.md",
@@ -150,23 +150,23 @@
  "chai": "^3.5.0",
  "color": "^0.11.1",
  "colors": "1.1.2",
- "commitizen": "^2.8.1",
+ "commitizen": "^2.8.2",
  "coveralls": "^2.11.8",
  "cz-conventional-changelog": "1.1.6",
  "doctoc": "^1.0.0",
  "esdoc": "^0.4.6",
- "eslint": "^2.4.0",
- "fs-extra": "^0.26.5",
+ "eslint": "^2.12.0",
+ "fs-extra": "^0.30.0",
  "ghooks": "1.2.3",
  "glob": "^7.0.3",
- "gm": "1.21.1",
+ "gm": "^1.22.0",
  "google-closure-compiler": "20160517.1.0",
  "gzip-size": "^3.0.0",
  "http-server": "^0.9.0",
  "istanbul": "0.4.3",
  "lodash": "4.13.1",
  "madge": "^0.5.3",
- "markdown-doctest": "^0.3.2",
+ "markdown-doctest": "^0.7.0",
  "minimist": "^1.2.0",
  "mkdirp": "^0.5.1",
  "mocha": "2.5.3",
@@ -179,17 +179,17 @@
  "protractor": "^3.1.1",
  "remap-istanbul": "0.6.4",
  "rx": "latest",
- "shx": "^0.1.1",
+ "shx": "^0.1.2",
  "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",
- "tslint": "3.10.2",
+ "tslint": "^3.11.0",
  "typescript": "^1.8.10",
- "typings": "^0.7.8",
+ "typings": "^1.0.5",
  "validate-commit-msg": "^2.3.1",
- "watch": "^0.17.1",
+ "watch": "^0.18.0",
  "watchify": "3.7.0",
  "webpack": "^1.13.1",
  "xmlhttprequest": "1.8.0"

spec/helpers/marble-testing.ts

@@ -1,4 +1,4 @@
-///<reference path='../../typings/main.d.ts'/>
+///<reference path='../../typings/index.d.ts'/>
 import {Observable} from '../../dist/cjs/Observable';
 import {SubscriptionLog} from '../../dist/cjs/testing/SubscriptionLog';
 import {ColdObservable} from '../../dist/cjs/testing/ColdObservable';

spec/helpers/test-helper.ts

@@ -1,4 +1,4 @@
-///<reference path='../../typings/main.d.ts'/>
+///<reference path='../../typings/index.d.ts'/>
 declare const global: any;
 declare const Symbol: any;
 

spec/helpers/testScheduler-ui.ts

@@ -1,4 +1,4 @@
-///<reference path='../../typings/main.d.ts'/>
+///<reference path='../../typings/index.d.ts'/>
 ///<reference path='ambient.d.ts'/>
 
 import * as _ from 'lodash';

typings.json

@@ -1,14 +1,15 @@
 {
  "name": "@reactivex/rxjs",
- "dependencies": {},
  "devDependencies": {
- "lodash": "github:typed-typings/npm-lodash#65781ee6b25562ee9b5913043a3ba249acfcee17",
- "chai": "registry:npm/chai#3.4.0+20160308201903",
- "sinon": "registry:npm/sinon#1.16.0+20160309002336",
+ "chai": "registry:npm/chai#3.5.0+20160415060238",
+ "lodash": "registry:npm/lodash#4.0.0+20160416211519",
+ "sinon": "registry:npm/sinon#1.16.0+20160427193336",
  "sinon-chai": "registry:npm/sinon-chai#2.8.0+20160310030142"
  },
- "ambientDependencies": {
- "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2",
+ "globalDevDependencies": {
  "mocha": "registry:dt/mocha#2.2.5+20160317120654"
+ },
+ "globalDependencies": {
+ "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504"
  }
 }