From b845719109fc8eef8d1bcb095038645b07bc113d Mon Sep 17 00:00:00 2001 From: Sameer Goyal Date: Mon, 10 Sep 2018 21:09:52 -0700 Subject: [PATCH 1/2] Update typings for latest versions of preact & redux --- package.json | 4 ++-- src/preact-redux.d.ts | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 5866e59..dd432c4 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ }, "homepage": "https://github.com/developit/preact-redux", "peerDependencies": { - "preact": ">=3", - "redux": ">=2" + "preact": ">=8.2.8", + "redux": ">=4" }, "devDependencies": { "babel-cli": "^6.24.1", diff --git a/src/preact-redux.d.ts b/src/preact-redux.d.ts index 84226e1..6b29136 100644 --- a/src/preact-redux.d.ts +++ b/src/preact-redux.d.ts @@ -6,16 +6,14 @@ // Frank Tan // Daniil Kolesnik // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.4 +// TypeScript Version: 3.0 -import { AnyComponent, Component, ComponentConstructor, VNode } from 'preact'; -import { Store, Dispatch, ActionCreator } from 'redux'; +import { AnyComponent, Component, ComponentConstructor, VNode, RenderableProps } from 'preact'; +import { Store, Dispatch, ActionCreator, Action } from 'redux'; -// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766 -type Diff = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T]; -type Omit = Pick>; +type Omit = Pick>; -export interface DispatchProp { +export interface DispatchProp { dispatch?: Dispatch; } @@ -197,7 +195,7 @@ interface Options extends C * @param connectOptions If specified, further customizes the behavior of the connector. Additionally, any extra * options will be passed through to your selectorFactory in the factoryOptions argument. */ -export declare function connectAdvanced( +export declare function connectAdvanced( selectorFactory: SelectorFactory, connectOptions?: ConnectOptions & TFactoryOptions ): AdvancedComponentDecorator; @@ -210,7 +208,7 @@ export declare function connectAdvancedselector to return that * previous object when appropriate. */ -export interface SelectorFactory { +export interface SelectorFactory { (dispatch: Dispatch, factoryOptions: TFactoryOptions): Selector } @@ -275,5 +273,5 @@ export interface ProviderProps { * Makes the Redux store available to the connect() calls in the component hierarchy below. */ export class Provider extends Component { - render(props?: ProviderProps): VNode + render(props: RenderableProps): VNode } From 0e5e61813edcc62e580ba91d0033adc09e425be6 Mon Sep 17 00:00:00 2001 From: Sameer Goyal Date: Mon, 10 Sep 2018 21:33:28 -0700 Subject: [PATCH 2/2] Upgrade dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dd432c4..2da82e0 100644 --- a/package.json +++ b/package.json @@ -77,10 +77,10 @@ "mocha": "^3.2.0", "npm-run-all": "^4.0.2", "phantomjs-prebuilt": "^2.1.14", - "preact": "^8.1.0", + "preact": "^8.2.8", "pretty-bytes-cli": "^2.0.0", "react-redux": "^5.0.4", - "redux": "^3.6.0", + "redux": "^4.0.0", "rimraf": "^2.6.1", "rollup": "^0.41.6", "rollup-plugin-alias": "^1.2.1",