diff --git a/flow-typed/npm/express_v4.x.x.js b/flow-typed/npm/express_v4.x.x.js index 927fdfd76..01b9e9520 100644 --- a/flow-typed/npm/express_v4.x.x.js +++ b/flow-typed/npm/express_v4.x.x.js @@ -104,8 +104,8 @@ declare class express$Response extends http$ServerResponse mixins express$Reques declare type express$NextFunction = (err?: ?Error | 'route') => mixed; declare type express$Middleware = - ((req: $Subtype, res: express$Response, next: express$NextFunction) => mixed) | - ((error: Error, req: $Subtype, res: express$Response, next: express$NextFunction) => mixed); + ((req: express$Request, res: express$Response, next: express$NextFunction) => mixed) | + ((error: Error, req: express$Request, res: express$Response, next: express$NextFunction) => mixed); declare interface express$RouteMethodType { (middleware: express$Middleware): T; (...middleware: Array): T; @@ -155,7 +155,7 @@ declare class express$Router extends express$Route { param( param: string, callback: ( - req: $Subtype, + req: express$Request, res: express$Response, next: express$NextFunction, id: string diff --git a/flow-typed/npm/lodash_v4.x.x.js b/flow-typed/npm/lodash_v4.x.x.js index 50631683c..9a019c870 100644 --- a/flow-typed/npm/lodash_v4.x.x.js +++ b/flow-typed/npm/lodash_v4.x.x.js @@ -1066,7 +1066,7 @@ declare module "lodash" { ): Object; at(object?: ?Object, ...paths: Array): Array; at(object?: ?Object, paths: Array): Array; - create(prototype: T, properties: Object): $Supertype; + create(prototype: T, properties: Object): T; create(prototype: any, properties: void | null): {}; defaults(object?: ?Object, ...sources?: Array): Object; defaultsDeep(object?: ?Object, ...sources?: Array): Object; @@ -2725,7 +2725,7 @@ declare module "lodash/fp" { props(paths: Array, object: Object): Array; paths(paths: Array): (object: Object) => Array; paths(paths: Array, object: Object): Array; - create(prototype: T): $Supertype; + create(prototype: T): T; defaults(source: Object): (object: Object) => Object; defaults(source: Object, object: Object): Object; defaultsAll(objects: Array): Object; diff --git a/flow-typed/npm/prop-types_v15.x.x.js b/flow-typed/npm/prop-types_v15.x.x.js index 113b0b5c4..63fcffb8b 100644 --- a/flow-typed/npm/prop-types_v15.x.x.js +++ b/flow-typed/npm/prop-types_v15.x.x.js @@ -25,7 +25,7 @@ declare module 'prop-types' { declare var shape: React$PropType$Shape; declare function checkPropTypes( - propTypes: $Subtype<{[_: $Keys]: $npm$propTypes$ReactPropsCheckType}>, + propTypes: {[_: $Keys]: $npm$propTypes$ReactPropsCheckType}, values: V, location: string, componentName: string, diff --git a/flow-typed/npm/redux_v3.x.x.js b/flow-typed/npm/redux_v3.x.x.js index 7bc662368..9c2edf841 100644 --- a/flow-typed/npm/redux_v3.x.x.js +++ b/flow-typed/npm/redux_v3.x.x.js @@ -12,7 +12,7 @@ declare module 'redux' { */ declare export type DispatchAPI = (action: A) => A; - declare export type Dispatch }> = DispatchAPI; + declare export type Dispatch = DispatchAPI; declare export type MiddlewareAPI> = { dispatch: D; diff --git a/src/reducers/index.js b/src/reducers/index.js index 3b30d4db3..e6f89ee0f 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -36,6 +36,7 @@ import type { } from './plugins.js'; import type {Store as ReduxStore} from 'redux'; +// $FlowFixMe introduced when removing $Subtype/$Supertype export type Store = ReduxStore< {| application: ApplicationState,