Merge remote-tracking branch 'upstream/master' into merge_7_25

This commit is contained in:
Ryan Cavanaugh
2016-07-27 10:57:46 -07:00
312 changed files with 30700 additions and 5251 deletions

View File

@@ -9,12 +9,12 @@ import * as React from 'react';
interface IDevTools {
new (): JSX.ElementClass;
instrument(): Function;
instrument(): Function
}
export declare function createDevTools(el: React.ReactElement<any>): IDevTools;
export declare function persistState(debugSessionKey: string): Function;
declare var factory: { instrument(): Function };
declare const factory: { instrument(): Function };
export default factory;

View File

@@ -10,7 +10,7 @@ import { Component } from 'react';
declare var m1: Middleware;
declare var m2: Middleware;
declare var m3: Middleware;
declare var reducer: Reducer;
declare var reducer: Reducer<any>;
class CounterApp extends Component<any, any> { };
class Provider extends Component<{ store: any }, any> { };