Merge branch 'master' into gitlaura-cancel-cloud-install

Author: gitlaura

.gitignore

@@ -11,3 +11,4 @@ build/*
 node_modules/*
 npm-debug.log
 tmp/*
+third_party/typings

package.json

@@ -62,9 +62,9 @@
     "socks5-http-client": "^1.0.2",
     "ssh2": "0.4.12",
     "ssh2-streams": "0.0.18",
-    "tsd": "^0.6.5",
     "tslint": "^3.3.0",
     "typescript": "~1.8.2",
+    "typings": "^0.7.12",
     "yargs": "^3.0.4"
   },
   "scripts": {

setup.cmd

@@ -43,7 +43,7 @@ if "%1" NEQ "third_party" if "%1" NEQ "clean" (
 	%~1
 goto:eof
 
-:: On Windows, npm, bower, tsd, and grunt are batch files
+:: On Windows, npm, bower, typings, and grunt are batch files
 :: So we have to explicitly call then with "call"
 :: These also happen to be the commands that we want to assert, 
 :: or exit on failure for, so there is an additional "exit /b"
@@ -72,13 +72,10 @@ goto:eof
 	call :runCmd "copy build\dev\uproxy-lib\build-tools\*.js build\tools\"
 goto:eof
 
-:: Note: The "tsd reinstall" command seems to create a third_party/third_party folder 
-:: on Windows, so we manually delete this after
 :thirdParty
 	call :runAndAssertCmdArgs "%NPM_BIN_DIR%bower" install --allow-root
 	call :runCmd "mkdir build\third_party"
-	call :runAndAssertCmdArgs "%NPM_BIN_DIR%tsd" reinstall --config .\third_party\tsd.json
-	call :runCmd "rmdir third_party\third_party /s /q"
+	call :runAndAssertCmdArgs cd third_party; "%NPM_BIN_DIR%tsd" reinstall --config .\third_party\tsd.json; cd ..
 	call :runCmd "robocopy third_party\ build\third_party\ /s /e > nul 2>&1"
 	call :runCmd "mkdir build\third_party\freedom-pgp-e2e"
 	call :runCmd "copy node_modules\freedom-pgp-e2e\dist build\third_party\freedom-pgp-e2e\"

setup.sh

@@ -39,7 +39,7 @@ function thirdParty ()
 {
   runAndAssertCmd "$NPM_BIN_DIR/bower install --allow-root --config.interactive=false"
   runAndAssertCmd "mkdir -p build/third_party"
-  runAndAssertCmd "$NPM_BIN_DIR/tsd reinstall --config ./third_party/tsd.json"
+  runAndAssertCmd "pushd third_party && $NPM_BIN_DIR/typings install && popd"
   runAndAssertCmd "cp -r third_party/* build/third_party/"
   runAndAssertCmd "mkdir -p build/third_party/freedom-pgp-e2e"
   runAndAssertCmd "cp -r node_modules/freedom-pgp-e2e/dist build/third_party/freedom-pgp-e2e/"

src/aqm/aqm.ts

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import logging = require('../logging/logging');
 

src/arraybuffers/arraybuffers.spec.ts

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import arraybuffers = require('./arraybuffers');
 

src/arraybuffers/arraybuffers.ts

@@ -1,4 +1,4 @@
-/// <reference path='../../../third_party/typings/node/node.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 // Byte-wise equality check of array buffers by comparison of each byte's
 // value.

src/benchmark/benchmark.core-env.ts

@@ -1,8 +1,6 @@
 // benchmark.ts benchmarks the proxy.  It should be running on localhost:9999
 
-/// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
-/// <reference path='../../../third_party/typings/request/request.d.ts' />
-//// <reference path='../../../third_party/typings/node/node.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import request = require('request');
 import util = require('util');

src/bridge/bridge.spec.ts

@@ -1,15 +1,15 @@
-/// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
-/// <reference path='../../../third_party/typings/jasmine/jasmine.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import freedomMocker = require('../freedom/mocks/mock-freedom-in-module-env');
-import mockFreedomRtcPeerConnection = require('../freedom/mocks/mock-rtcpeerconnection');
+declare var freedom: freedom.FreedomInModuleEnv;
 freedom = freedomMocker.makeMockFreedomInModuleEnv({
   'core.rtcpeerconnection': () => { return new mockFreedomRtcPeerConnection(); }
 });
 
 import bridge = require('./bridge');
 import datachannel = require('../webrtc/datachannel');
 import handler = require('../handler/queue');
+import mockFreedomRtcPeerConnection = require('../freedom/mocks/mock-rtcpeerconnection');
 import peerconnection = require('../webrtc/peerconnection');
 import peerconnection_types = require('../webrtc/signals');
 

src/bridge/bridge.ts

@@ -1,5 +1,4 @@
-/// <reference path='../../../third_party/typings/es6-promise/es6-promise.d.ts' />
-/// <reference path='../../../third_party/typings/freedom/freedom-module-env.d.ts' />
+/// <reference path='../../../third_party/typings/browser.d.ts' />
 
 import churn = require('../churn/churn');
 import churn_types = require('../churn/churn.types');
@@ -8,6 +7,8 @@ import logging = require('../logging/logging');
 import peerconnection = require('../webrtc/peerconnection');
 import peerconnection_types = require('../webrtc/signals');
 
+declare const freedom: freedom.FreedomInModuleEnv;
+
 var log :logging.Log = new logging.Log('bridge');
 
 ////////