From 675b216b6ad599a9dc649a8fb326f367a6dcf748 Mon Sep 17 00:00:00 2001
From: Amin Cheloh <nineamin@hotmail.com>
Date: Sun, 24 Jul 2016 17:13:33 +0700
Subject: [PATCH 01/13] Update Boom to 3.2.2

---
 boom/boom.d.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boom/boom.d.ts b/boom/boom.d.ts
index 85c2e22b35..7495e3ae68 100644
--- a/boom/boom.d.ts
+++ b/boom/boom.d.ts
@@ -44,14 +44,17 @@ declare namespace Boom {
     export function rangeNotSatisfiable(message?: string, data?: any): BoomError;
     export function expectationFailed(message?: string, data?: any): BoomError;
     export function badData(message?: string, data?: any): BoomError;
+    export function locked(message?: string, data?: any): BoomError;
+    export function preconditionRequired(message?: string, data?: any): BoomError;
     export function tooManyRequests(message?: string, data?: any): BoomError;
+    export function illegal(message?: string, data?: any): BoomError;
 
     // 5xx
+    export function badImplementation(message?: string, data?: any): BoomError;
     export function notImplemented(message?: string, data?: any): BoomError;
     export function badGateway(message?: string, data?: any): BoomError;
-    export function serverTimeout(message?: string, data?: any): BoomError;
+    export function serverUnavailable(message?: string, data?: any): BoomError;
     export function gatewayTimeout(message?: string, data?: any): BoomError;
-    export function badImplementation(message?: string, data?: any): BoomError;
 }
 
 declare module "boom" {

From 82e655b668ec2e69ac13baadd79c7b4464e91a56 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclantonthuon@outlook.com>
Date: Sun, 24 Jul 2016 04:24:10 -0700
Subject: [PATCH 02/13] Fixing issue in webpack.d.ts

---
 webpack/webpack.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/webpack.d.ts b/webpack/webpack.d.ts
index e2ed2d1658..96a7c710df 100644
--- a/webpack/webpack.d.ts
+++ b/webpack/webpack.d.ts
@@ -102,7 +102,7 @@ declare module "webpack" {
             /** Include comments with information about the modules. */
             pathinfo?: boolean;
             /** If set, export the bundle as library. output.library is the name. */
-            library?: boolean;
+            library?: string;
             /**
              * Which format to export the library:
              * <ul>

From a3359b33ec98d4054038af7589acca456ed96978 Mon Sep 17 00:00:00 2001
From: Birk Skyum <birkskyum@gmail.com>
Date: Sun, 24 Jul 2016 13:38:20 +0200
Subject: [PATCH 03/13] Fix export issues in parse.d.ts

In node: Module '"parse/node"' resolves to a non-module entity and cannot be imported using this construct.
In browser: Module '"parse"' resolves to a non-module entity and cannot be imported using this construct.

Parse can now be imported like:
import * as Parse from 'parse/node'
---
 parse/parse.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parse/parse.d.ts b/parse/parse.d.ts
index 825eedf386..6cf51a98b4 100644
--- a/parse/parse.d.ts
+++ b/parse/parse.d.ts
@@ -1087,10 +1087,10 @@ declare namespace Parse {
 }
 
 declare module "parse/node" {
-    export = { Parse };
+    export = Parse;
 }
 
 declare module "parse" {
-    import parse = require("parse/node");
+    import * as parse from "parse/node";
     export = parse
 }

From f7163677f8c8436bac263beb455407351cf25686 Mon Sep 17 00:00:00 2001
From: Zhuohuan LI <zixia@zixia.net>
Date: Sun, 24 Jul 2016 20:19:34 +0800
Subject: [PATCH 04/13] add `protocol`, fix verifyClient callback defination

---
 ws/ws-tests.ts | 27 ++++++++++++++++++++++++++-
 ws/ws.d.ts     | 12 +++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ws/ws-tests.ts b/ws/ws-tests.ts
index ec2bc431e0..0c1887527e 100644
--- a/ws/ws-tests.ts
+++ b/ws/ws-tests.ts
@@ -1,6 +1,9 @@
 /// <reference path="ws.d.ts" />
 
 import WebSocket = require('ws');
+import http = require('http');
+// import * as http from 'http'
+
 var WebSocketServer = WebSocket.Server;
 
 {
@@ -29,7 +32,7 @@ var WebSocketServer = WebSocket.Server;
 {
     var wss = new WebSocketServer({port: 8080});
 
-    function broadcast(data: any) {
+    const broadcast = function(data: any) {
         for(var i in wss.clients)
             wss.clients[i].send(data);
     };
@@ -51,3 +54,25 @@ var WebSocketServer = WebSocket.Server;
         }, 500);
     });
 }
+
+{
+    
+    const verifyClient = function(
+      info: {
+        origin: string
+        secure: boolean
+        req: http.ServerRequest
+      }
+      , callback: (res: boolean) => void
+    ): void {
+        callback(true)
+    }
+    
+    var wsv = new WebSocketServer({
+        verifyClient
+    })
+    
+    wsv.on('connection', function connection(ws) {
+        console.log(ws.protocol)
+    })
+}
\ No newline at end of file
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index d9a1338d21..235b538030 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -22,6 +22,7 @@ declare module "ws" {
         url: string;
         supports: any;
         upgradeReq: http.ServerRequest;
+        protocol: string;
 
         CONNECTING: number;
         OPEN: number;
@@ -91,11 +92,12 @@ declare module "ws" {
             host?: string;
             port?: number;
             server?: http.Server;
-            verifyClient?: {
-                (info: {origin: string; secure: boolean; req: http.ServerRequest}): boolean;
-                (info: {origin: string; secure: boolean; req: http.ServerRequest},
-                                                 callback: (res: boolean) => void): void;
-            };
+            verifyClient?: (
+                ((info: {origin: string; secure: boolean; req: http.ServerRequest}) => boolean)
+                |
+                ((info: {origin: string; secure: boolean; req: http.ServerRequest},
+                    callback: (res: boolean) => void) => void)
+            );
             handleProtocols?: any;
             path?: string;
             noServer?: boolean;

From c32177d0cdfd4e04102a845925bd012c7f33e3fd Mon Sep 17 00:00:00 2001
From: Zhuohuan LI <zixia@zixia.net>
Date: Sun, 24 Jul 2016 20:21:53 +0800
Subject: [PATCH 05/13] type alias for 2 callback, fix #10250

---
 ws/ws.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index 235b538030..6b94bee19d 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -88,16 +88,16 @@ declare module "ws" {
     }
 
     namespace WebSocket {
+                
+        type VerifyClientCallbackSync = (info: {origin: string; secure: boolean; req: http.ServerRequest}) => boolean;
+        type VerifyClientCallbackAsync = (info: {origin: string; secure: boolean; req: http.ServerRequest}
+                                            , callback: (res: boolean) => void) => void;
+
         export interface IServerOptions {
             host?: string;
             port?: number;
             server?: http.Server;
-            verifyClient?: (
-                ((info: {origin: string; secure: boolean; req: http.ServerRequest}) => boolean)
-                |
-                ((info: {origin: string; secure: boolean; req: http.ServerRequest},
-                    callback: (res: boolean) => void) => void)
-            );
+            verifyClient?: VerifyClientCallbackAsync | VerifyClientCallbackSync;
             handleProtocols?: any;
             path?: string;
             noServer?: boolean;

From 6a6f78076bcc98d7c4150d1b294ae06a1f04d69c Mon Sep 17 00:00:00 2001
From: Zhuohuan LI <zixia@zixia.net>
Date: Sun, 24 Jul 2016 20:25:36 +0800
Subject: [PATCH 06/13] work with --target es6

---
 ws/ws-tests.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ws/ws-tests.ts b/ws/ws-tests.ts
index 0c1887527e..a8afa8cb99 100644
--- a/ws/ws-tests.ts
+++ b/ws/ws-tests.ts
@@ -1,8 +1,7 @@
 /// <reference path="ws.d.ts" />
 
-import WebSocket = require('ws');
-import http = require('http');
-// import * as http from 'http'
+import * as WebSocket from 'ws';
+import * as http from'http';
 
 var WebSocketServer = WebSocket.Server;
 
@@ -56,7 +55,6 @@ var WebSocketServer = WebSocket.Server;
 }
 
 {
-    
     const verifyClient = function(
       info: {
         origin: string

From 29e1a843c288692a5c4925721c0e9c95ea9aa188 Mon Sep 17 00:00:00 2001
From: Wang Guan <momocraft@gmail.com>
Date: Tue, 12 Jul 2016 01:09:21 +0900
Subject: [PATCH 07/13] let the following interfaces extend `ViewProperties`: -
 ActivityIndicatorIOSProperties - ActivityIndicatorProperties -
 DatePickerIOSProperties - DrawerLayoutAndroidProperties - PickerProperties -
 MapViewProperties - ProgressBarAndroidProperties - ProgressViewIOSProperties
 - RefreshControlProperties - ScrollViewProperties - ListViewProperties -
 SegmentedControlIOSProperties - SliderProperties - SliderIOSProperties -
 TabBarIOSProperties - TabBarItemProperties - SwitchProperties -
 SwitchPropertiesIOS - WebViewProperties

---
 react-native/react-native.d.ts | 91 +++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 23 deletions(-)

diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index 0ffc6763a7..bfb977ffed 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -918,7 +918,7 @@ declare namespace  __React {
         showWithText?: boolean
     }
 
-    export interface ToolbarAndroidProperties extends React.Props<ToolbarAndroidStatic> {
+    export interface ToolbarAndroidProperties extends ViewProperties, React.Props<ToolbarAndroidStatic> {
         actions?: ToolbarAndroidAction[]
 
         /**
@@ -1000,6 +1000,8 @@ declare namespace  __React {
          * Sets the toolbar title color.
          */
         titleColor?: string
+
+        ref?: Ref<ToolbarAndroidStatic>
     }
 
     export interface ToolbarAndroidStatic extends React.ComponentClass<ToolbarAndroidProperties> {
@@ -1479,7 +1481,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/webview.html#props
      */
-    export interface WebViewProperties extends WebViewPropertiesAndroid, WebViewPropertiesIOS, React.Props<WebViewStatic> {
+    export interface WebViewProperties extends ViewProperties, WebViewPropertiesAndroid, WebViewPropertiesIOS, React.Props<WebViewStatic> {
 
         automaticallyAdjustContentInsets?: boolean
 
@@ -1553,6 +1555,8 @@ declare namespace  __React {
          * sets whether the webpage scales to fit the view and the user can change the scale
          */
         scalesPageToFit?: boolean
+        
+        ref?: Ref<WebViewStatic & ViewStatic>
     }
 
 
@@ -1590,7 +1594,7 @@ declare namespace  __React {
          target: number
      }
 
-     export interface SegmentedControlIOSProperties extends React.Props<SegmentedControlIOSStatic> {
+     export interface SegmentedControlIOSProperties extends ViewProperties, React.Props<SegmentedControlIOSStatic> {
 
          /**
           * If false the user won't be able to interact with the control. Default value is true.
@@ -1630,6 +1634,8 @@ declare namespace  __React {
           * The labels for the control's segment buttons, in order.
           */
          values?: string[]
+
+         ref?: Ref<SegmentedControlIOSStatic>
      }
 
     export interface SegmentedControlIOSStatic extends React.ComponentClass<SegmentedControlIOSProperties> {
@@ -1744,7 +1750,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/activityindicator.html#props
      */
-    export interface ActivityIndicatorProperties extends React.Props<ActivityIndicatorStatic> {
+    export interface ActivityIndicatorProperties extends ViewProperties, React.Props<ActivityIndicatorStatic> {
 
         /**
          * Whether to show the indicator (true, the default) or hide it (false).
@@ -1770,6 +1776,8 @@ declare namespace  __React {
         size?: 'small' | 'large'
 
         style?: ViewStyle
+
+        ref?: Ref<ActivityIndicatorStatic>
     }
 
     export interface ActivityIndicatorStatic extends React.ComponentClass<ActivityIndicatorProperties> {
@@ -1779,7 +1787,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
      */
-    export interface ActivityIndicatorIOSProperties extends React.Props<ActivityIndicatorIOSStatic> {
+    export interface ActivityIndicatorIOSProperties extends ViewProperties, React.Props<ActivityIndicatorIOSStatic> {
 
         /**
          * Whether to show the indicator (true, the default) or hide it (false).
@@ -1810,6 +1818,8 @@ declare namespace  __React {
         size?: 'small' | 'large'
 
         style?: ViewStyle
+
+        ref?: Ref<ActivityIndicatorIOSStatic>
     }
 
     /**
@@ -1819,7 +1829,7 @@ declare namespace  __React {
     }
 
 
-    export interface DatePickerIOSProperties extends React.Props<DatePickerIOSStatic> {
+    export interface DatePickerIOSProperties extends ViewProperties, React.Props<DatePickerIOSStatic> {
 
         /**
          * The currently selected date.
@@ -1865,6 +1875,7 @@ declare namespace  __React {
          */
         timeZoneOffsetInMinutes?: number
 
+        ref?: Ref<DatePickerIOSStatic>
     }
 
     export interface DatePickerIOSStatic extends React.ComponentClass<DatePickerIOSProperties> {
@@ -1876,7 +1887,7 @@ declare namespace  __React {
     /**
      * @see DrawerLayoutAndroid.android.js
      */
-    export interface DrawerLayoutAndroidProperties extends React.Props<DrawerLayoutAndroidStatic> {
+    export interface DrawerLayoutAndroidProperties extends ViewProperties, React.Props<DrawerLayoutAndroidStatic> {
 
         /**
          * Specifies the background color of the drawer. The default value
@@ -1967,6 +1978,7 @@ declare namespace  __React {
          */
         statusBarBackgroundColor?: any
 
+        ref?: Ref<DrawerLayoutAndroidStatic & ViewStatic>
     }
 
     export interface DrawerLayoutAndroidStatic extends React.ComponentClass<DrawerLayoutAndroidProperties> {
@@ -2010,18 +2022,22 @@ declare namespace  __React {
     export interface PickerItemStatic extends React.ComponentClass<PickerItemProperties> {
     }
 
-    export interface PickerPropertiesIOS extends React.Props<PickerStatic> {
+    export interface PickerPropertiesIOS extends ViewProperties, React.Props<PickerStatic> {
 
         itemStyle?: ViewStyle
+
+        ref?: Ref<PickerStatic & ViewStatic>
     }
 
-    export interface PickerPropertiesAndroid extends React.Props<PickerStatic> {
+    export interface PickerPropertiesAndroid extends ViewProperties, React.Props<PickerStatic> {
 
         enabled?: boolean
 
         mode?: "dialog" | "dropdown"
 
         prompt?: string
+
+        ref?: Ref<PickerStatic & ViewStatic>
     }
 
     /**
@@ -2052,6 +2068,8 @@ declare namespace  __React {
          * Used to locate this view in end-to-end tests.
          */
         testId?: string
+
+        ref?: Ref<PickerStatic>
     }
 
     /**
@@ -2086,7 +2104,7 @@ declare namespace  __React {
      * @see https://facebook.github.io/react-native/docs/progressbarandroid.html
      * @see ProgressBarAndroid.android.js
      */
-    export interface ProgressBarAndroidProperties extends React.Props<ProgressBarAndroidStatic> {
+    export interface ProgressBarAndroidProperties extends ViewProperties, React.Props<ProgressBarAndroidStatic> {
 
         style?: ViewStyle
 
@@ -2122,6 +2140,8 @@ declare namespace  __React {
          * Used to locate this view in end-to-end tests.
          */
         testID?: string
+
+        ref?: Ref<ProgressBarAndroidStatic>
     }
     export interface ProgressBarAndroidStatic extends React.ComponentClass<ProgressBarAndroidProperties> {
     }
@@ -2130,7 +2150,7 @@ declare namespace  __React {
      * @see https://facebook.github.io/react-native/docs/progressviewios.html
      * @see ProgressViewIOS.ios.js
      */
-    export interface ProgressViewIOSProperties extends React.Props<ProgressViewIOSStatic> {
+    export interface ProgressViewIOSProperties extends ViewProperties, React.Props<ProgressViewIOSStatic> {
 
         style?: ViewStyle
 
@@ -2163,11 +2183,13 @@ declare namespace  __React {
          * A stretchable image to display behind the progress bar.
          */
         trackImage?: any
+
+        ref?: Ref<ProgressViewIOSStatic>
     }
     export interface ProgressViewIOSStatic extends React.ComponentClass<ProgressViewIOSProperties> {
     }
 
-    export interface RefreshControlPropertiesIOS extends React.Props<RefreshControlStatic> {
+    export interface RefreshControlPropertiesIOS extends ViewProperties, React.Props<RefreshControlStatic> {
 
         /**
          * The color of the refresh indicator.
@@ -2183,9 +2205,11 @@ declare namespace  __React {
          * Title color.
          */
         titleColor?: string
+
+        ref?: Ref<RefreshControlStatic & ViewStatic>
     }
 
-    export interface RefreshControlPropertiesAndroid extends React.Props<RefreshControlStatic> {
+    export interface RefreshControlPropertiesAndroid extends ViewProperties, React.Props<RefreshControlStatic> {
 
         /**
          * The colors (at least one) that will be used to draw the refresh indicator.
@@ -2212,6 +2236,8 @@ declare namespace  __React {
          * @platform android
          */
         progressViewOffset?: number
+
+        ref?: Ref<RefreshControlStatic & ViewStatic>
     }
 
     export interface RefreshControlProperties extends RefreshControlPropertiesIOS, RefreshControlPropertiesAndroid, React.Props<RefreshControl> {
@@ -2225,13 +2251,15 @@ declare namespace  __React {
          * Whether the view should be indicating an active refresh.
          */
         refreshing?: boolean
+        
+        ref?: Ref<RefreshControlStatic>
     }
 
     export interface RefreshControlStatic extends React.ComponentClass<RefreshControlProperties> {
         SIZE: Object // Undocumented
     }
 
-    export interface SliderPropertiesIOS extends React.Props<SliderStatic> {
+    export interface SliderPropertiesIOS extends ViewProperties, React.Props<SliderStatic> {
 
         /**
          * Assigns a maximum track image. Only static images are supported.
@@ -2268,6 +2296,8 @@ declare namespace  __React {
          * to fill the track.
          */
         trackImage?: any
+
+        ref?: Ref<SliderStatic>
     }
 
     export interface SliderProperties extends SliderPropertiesIOS, React.Props<SliderStatic> {
@@ -2333,7 +2363,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/sliderios.html
      */
-    export interface SliderIOSProperties extends React.Props<SliderIOSStatic> {
+    export interface SliderIOSProperties extends ViewProperties, React.Props<SliderIOSStatic> {
 
         /**
          * If true the user won't be able to move the slider. Default value is false.
@@ -2393,6 +2423,8 @@ declare namespace  __React {
          * This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
          */
         value?: number
+
+        ref?: Ref<SliderIOSStatic>
     }
 
     export interface SliderIOSStatic extends React.ComponentClass<SliderIOSProperties> {
@@ -2721,6 +2753,8 @@ declare namespace  __React {
          * pixels.
          */
         scrollRenderAheadDistance?: number
+
+        ref?: Ref<ListViewStatic & ScrollViewStatic & ViewStatic>
     }
 
     export interface ListViewStatic extends React.ComponentClass<ListViewProperties> {
@@ -2815,7 +2849,7 @@ declare namespace  __React {
         active?: boolean
     }
 
-    export interface MapViewProperties extends MapViewPropertiesIOS, MapViewPropertiesAndroid, Touchable, React.Props<MapViewStatic> {
+    export interface MapViewProperties extends MapViewPropertiesIOS, MapViewPropertiesAndroid, Touchable, ViewProperties, React.Props<MapViewStatic> {
 
 
 
@@ -2884,6 +2918,8 @@ declare namespace  __React {
          * Default value is true.
          */
         zoomEnabled?: boolean
+
+        ref?: Ref<MapViewStatic & ViewStatic>
     }
 
     /**
@@ -3502,7 +3538,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/tabbarios-item.html#props
      */
-    export interface TabBarItemProperties extends React.Props<TabBarItemStatic> {
+    export interface TabBarItemProperties extends ViewProperties, React.Props<TabBarItemStatic> {
 
         /**
          * Little red bubble that sits at the top right of the icon.
@@ -3549,6 +3585,7 @@ declare namespace  __React {
          */
         title?: string
 
+        ref?: Ref<TabBarItemStatic & ViewStatic>
     }
 
     export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {
@@ -3557,7 +3594,7 @@ declare namespace  __React {
     /**
      * @see https://facebook.github.io/react-native/docs/tabbarios.html#props
      */
-    export interface TabBarIOSProperties extends React.Props<TabBarIOSStatic> {
+    export interface TabBarIOSProperties extends ViewProperties, React.Props<TabBarIOSStatic> {
 
         /**
          * Background color of the tab bar
@@ -3580,6 +3617,8 @@ declare namespace  __React {
          * Color of text on unselected tabs
          */
         unselectedTintColor?: string
+        
+        ref?: Ref<TabBarIOSStatic & ViewStatic>
     }
 
     export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
@@ -3959,7 +3998,7 @@ declare namespace  __React {
 
     }
 
-    export interface ScrollViewProperties extends ScrollViewPropertiesIOS, ScrollViewPropertiesAndroid, Touchable {
+    export interface ScrollViewProperties extends ViewProperties, ScrollViewPropertiesIOS, ScrollViewPropertiesAndroid, Touchable, React.Props<ScrollViewStatic> {
 
         /**
          * These styles will be applied to the scroll view content container which
@@ -4043,10 +4082,12 @@ declare namespace  __React {
          * functionality for the ScrollView.
          */
         refreshControl?: RefreshControl
+
+        ref?: Ref<ScrollViewStatic & ViewStatic>
     }
 
     export interface ScrollViewProps extends ScrollViewProperties, React.Props<ScrollViewStatic> {
-
+        ref?: Ref<ScrollViewStatic>
     }
 
     interface ScrollViewStatic extends React.ComponentClass<ScrollViewProps> {
@@ -5084,7 +5125,7 @@ declare namespace  __React {
         LONG: number
     }
 
-    export interface SwitchPropertiesIOS extends React.Props<SwitchStatic> {
+    export interface SwitchPropertiesIOS extends ViewProperties, React.Props<SwitchStatic> {
 
         /**
          * Background color when the switch is turned on.
@@ -5100,9 +5141,11 @@ declare namespace  __React {
          * Background color when the switch is turned off.
          */
         tintColor?: string
+
+        ref?: Ref<SwitchStatic>
     }
 
-    export interface SwitchProperties extends React.Props<SwitchStatic> {
+    export interface SwitchProperties extends ViewProperties, React.Props<SwitchStatic> {
 
         /**
          * If true the user won't be able to toggle the switch.
@@ -5126,7 +5169,9 @@ declare namespace  __React {
          */
         value?: boolean
 	
-	style?: ViewStyle
+	    style?: ViewStyle
+
+        ref?: Ref<SwitchStatic>
     }
 
     export interface SwitchStatic extends React.ComponentClass<SwitchProperties> {

From 037c33d5e03e4cea623915a260adccfdc557426b Mon Sep 17 00:00:00 2001
From: Wang Guan <momocraft@gmail.com>
Date: Mon, 25 Jul 2016 03:38:40 +0900
Subject: [PATCH 08/13] remove Promise from react-native

---
 react-native/react-native.d.ts | 96 ----------------------------------
 1 file changed, 96 deletions(-)

diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index 0ffc6763a7..e4f942b474 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -24,102 +24,6 @@ import React = __React;
 //react-native "extends" react
 declare namespace  __React {
 
-    /**
-     * Represents the completion of an asynchronous operation
-     * @see lib.es6.d.ts
-     */
-    export interface Promise<T> {
-        /**
-         * Attaches callbacks for the resolution and/or rejection of the Promise.
-         * @param onfulfilled The callback to execute when the Promise is resolved.
-         * @param onrejected The callback to execute when the Promise is rejected.
-         * @returns A Promise for the completion of which ever callback is executed.
-         */
-        then<TResult>( onfulfilled?: ( value: T ) => TResult | Promise<TResult>, onrejected?: ( reason: any ) => TResult | Promise<TResult> ): Promise<TResult>;
-
-        /**
-         * Attaches a callback for only the rejection of the Promise.
-         * @param onrejected The callback to execute when the Promise is rejected.
-         * @returns A Promise for the completion of the callback.
-         */
-        catch( onrejected?: ( reason: any ) => T | Promise<T> ): Promise<T>;
-
-
-        // not in lib.es6.d.ts but called by react-native
-        done( callback?: ( value: T ) => void ): void;
-    }
-
-    export interface PromiseConstructor {
-        /**
-         * A reference to the prototype.
-         */
-        prototype: Promise<any>;
-
-        /**
-         * Creates a new Promise.
-         * @param init A callback used to initialize the promise. This callback is passed two arguments:
-         * a resolve callback used resolve the promise with a value or the result of another promise,
-         * and a reject callback used to reject the promise with a provided reason or error.
-         */
-        new <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
-
-        <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
-
-        /**
-         * Creates a Promise that is resolved with an array of results when all of the provided Promises
-         * resolve, or rejected when any Promise is rejected.
-         * @param values An array of Promises.
-         * @returns A new Promise.
-         */
-        all<T>( values: (T | Promise<T>)[] ): Promise<T[]>;
-
-        /**
-         * Creates a Promise that is resolved with an array of results when all of the provided Promises
-         * resolve, or rejected when any Promise is rejected.
-         * @param values An array of values.
-         * @returns A new Promise.
-         */
-        all( values: Promise<void>[] ): Promise<void>;
-
-        /**
-         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-         * or rejected.
-         * @param values An array of Promises.
-         * @returns A new Promise.
-         */
-        race<T>( values: (T | Promise<T>)[] ): Promise<T>;
-
-        /**
-         * Creates a new rejected promise for the provided reason.
-         * @param reason The reason the promise was rejected.
-         * @returns A new rejected Promise.
-         */
-        reject( reason: any ): Promise<void>;
-
-        /**
-         * Creates a new rejected promise for the provided reason.
-         * @param reason The reason the promise was rejected.
-         * @returns A new rejected Promise.
-         */
-        reject<T>( reason: any ): Promise<T>;
-
-        /**
-         * Creates a new resolved promise for the provided value.
-         * @param value A promise.
-         * @returns A promise whose internal state matches the provided promise.
-         */
-        resolve<T>( value: T | Promise<T> ): Promise<T>;
-
-        /**
-         * Creates a new resolved promise .
-         * @returns A resolved promise.
-         */
-        resolve(): Promise<void>;
-    }
-
-    // @see lib.es6.d.ts
-    export var Promise: PromiseConstructor;
-
     module NativeMethodsMixin {
       type MeasureOnSuccessCallback = (
         x: number,

From 4691d1a545cec7524fc7bc44a0dcc133238ecfdb Mon Sep 17 00:00:00 2001
From: ymkjp <ymkjp@users.noreply.github.com>
Date: Mon, 25 Jul 2016 16:27:13 +0900
Subject: [PATCH 09/13] Bump up version on JqueryUI comment

---
 jqueryui/jqueryui.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index d508eba8a9..7391de7824 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQueryUI 1.9
+// Type definitions for jQueryUI 1.11
 // Project: http://jqueryui.com/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -625,9 +625,9 @@ declare namespace JQueryUI {
 
     interface Selectable extends Widget, SelectableOptions {
     }
-    
+
     // SelectMenu //////////////////////////////////////////////////
-    
+
     interface SelectMenuOptions extends SelectMenuEvents {
         appendTo?: string;
         disabled?: boolean;
@@ -1705,7 +1705,7 @@ interface JQuery {
     selectable(optionLiteral: string, optionName: string): any;
     selectable(optionLiteral: string, options: JQueryUI.SelectableOptions): any;
     selectable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
- 
+
     selectmenu(): JQuery;
     selectmenu(methodName: 'close'): JQuery;
     selectmenu(methodName: 'destroy'): JQuery;

From 060060dc34ef700a6ea9e00ccee69b570ff3c242 Mon Sep 17 00:00:00 2001
From: Volker Braun <tarpit@vbraun.imap.cc>
Date: Mon, 25 Jul 2016 09:33:51 +0200
Subject: [PATCH 10/13] Return intersection type when indexing IDocumentService
 (#10267)

Typescript 2.0 starts checking the compatibility of the index
signature with the base JQuery interface; Hence we are forced to
return Document & HTMLElement to be compatible with the base.
---
 angularjs/angular.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 5aa6807605..bb028f3425 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -986,7 +986,8 @@ declare namespace angular {
     // see http://docs.angularjs.org/api/ng.$document
     ///////////////////////////////////////////////////////////////////////////
     interface IDocumentService extends JQuery {
-        [index: number]: Document;
+        // Must return intersection type for index signature compatibility with JQuery
+        [index: number]: HTMLElement & Document;
     }
 
     ///////////////////////////////////////////////////////////////////////////

From bef1a95d0c6e1550a5992ad970c42c16922d5e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Pluci=C5=84ski?= <adaskothebeast@gmail.com>
Date: Mon, 25 Jul 2016 11:00:48 +0200
Subject: [PATCH 11/13] fix for #10271 jstree

fix for #10271 jstree - get_path params not marked to be optional
---
 jstree/jstree-tests.ts | 5 +++++
 jstree/jstree.d.ts     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jstree/jstree-tests.ts b/jstree/jstree-tests.ts
index 1c8ef86c48..a6ea0eb290 100644
--- a/jstree/jstree-tests.ts
+++ b/jstree/jstree-tests.ts
@@ -109,3 +109,8 @@ var tree = $('a').jstree();
 tree.move_node('a', 'b', 0, (node: any, new_par: any, pos: any) => { }, true, true);
 tree.copy_node('a', 'b', 0, (node: any, new_par: any, pos: any) => { }, true, true);
 
+// #10271 jstree - get_path params not marked to be optional
+tree.get_path('nodeId');
+tree.get_path('nodeId', '/');
+tree.get_path('nodeId', '/', true);
+
diff --git a/jstree/jstree.d.ts b/jstree/jstree.d.ts
index f3961f7e3e..dde9a24b67 100644
--- a/jstree/jstree.d.ts
+++ b/jstree/jstree.d.ts
@@ -830,7 +830,7 @@ interface JSTree extends JQuery {
     * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
     * @return {mixed}
     */
-    get_path: (obj: any, glue: string, ids: boolean) => any;
+    get_path: (obj: any, glue?: string, ids?: boolean) => any;
 
     /**
     * get the next visible node that is below the `obj` node. If `strict` is set to `true` only sibling nodes are returned.

From 984cc66fbff3313eb2f715e41b1281527a6a76ab Mon Sep 17 00:00:00 2001
From: Adam Greene <adam@cognitivex.com>
Date: Mon, 25 Jul 2016 13:56:31 -0300
Subject: [PATCH 12/13] Fixed an issue with groupBy's compareSelector, it
 should be based on TKey not T.

---
 linq/linq.3.0.4-Beta5.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linq/linq.3.0.4-Beta5.d.ts b/linq/linq.3.0.4-Beta5.d.ts
index a6c32690ce..b6ae876eee 100644
--- a/linq/linq.3.0.4-Beta5.d.ts
+++ b/linq/linq.3.0.4-Beta5.d.ts
@@ -157,7 +157,7 @@ declare module linqjs {
         groupBy<TKey>(keySelector: (element: T) => TKey): IEnumerable<IGrouping<TKey, any>>;
         groupBy<TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): IEnumerable<IGrouping<TKey, TElement>>;
         groupBy<TKey, TElement, TResult>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement, resultSelector: (key: TKey, element: IEnumerable<TElement>) => TResult): IEnumerable<TResult>;
-        groupBy<TKey, TElement, TResult, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement, resultSelector: (key: TKey, element: IEnumerable<TElement>) => TResult, compareSelector: (element: T) => TCompare): IEnumerable<TResult>;
+        groupBy<TKey, TElement, TResult, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement, resultSelector: (key: TKey, element: IEnumerable<TElement>) => TResult, compareSelector: (element: TKey) => TCompare): IEnumerable<TResult>;
         // :IEnumerable<IGrouping<TKey, T>>
         partitionBy<TKey>(keySelector: (element: T) => TKey): IEnumerable<IGrouping<TKey, any>>;
         // :IEnumerable<IGrouping<TKey, TElement>>

From f92b6d38dffeead88c20a3c58dd402483d5b0a84 Mon Sep 17 00:00:00 2001
From: Mickael Burguet <mickael.burguet@ssense.com>
Date: Mon, 25 Jul 2016 16:31:23 -0400
Subject: [PATCH 13/13] [restify] add patch function definition

---
 restify/restify-tests.ts | 1 +
 restify/restify.d.ts     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/restify/restify-tests.ts b/restify/restify-tests.ts
index 767530d7aa..f9b0acfae1 100644
--- a/restify/restify-tests.ts
+++ b/restify/restify-tests.ts
@@ -312,6 +312,7 @@ client = restify.createStringClient({
 
 client.head('test', function(err: any, req: restify.Request, res: restify.Response) { });
 client.put('path', {}, function(err: any, req: restify.Request, res: restify.Response, obj: any) { });
+client.patch('path', {}, function(err: any, req: restify.Request, res: restify.Response, obj: any) { });
 client.del('path', function(err: any, req: restify.Request, res: restify.Response) { });
 
 client.post('/foo', { hello: 'world' }, function(err: any, req: restify.Request, res: restify.Response, obj: any) {
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
index 2da1c6e0bd..fdb64f5e34 100644
--- a/restify/restify.d.ts
+++ b/restify/restify.d.ts
@@ -473,6 +473,7 @@ declare module "restify" {
     head: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
     post: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
     put: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
+    patch: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
     del: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
     basicAuth: (username: string, password: string) => any;
   }
@@ -482,6 +483,7 @@ declare module "restify" {
     head: (path?:any, callback?: Function) => any;
     post: (opts?: any, callback?: Function) => any;
     put: (opts?: any, callback?: Function) => any;
+    patch: (opts?: any, callback?: Function) => any;
     del: (opts?: any, callback?: Function) => any;
   }