Fix typecheck errors from new redux major versions

src/sidebar/store/create-store.ts

 /* global process */
 import * as redux from 'redux';
-import thunk from 'redux-thunk';
+import { thunk } from 'redux-thunk';
 
 import { immutable } from '../util/immutable';
 import type { OmitFirstArg, TupleToIntersection } from './type-utils';

src/sidebar/store/modules/drafts.ts

@@ -2,7 +2,7 @@
  * The drafts store provides temporary storage for unsaved edits to new or
  * existing annotations.
  */
-import type { Dispatch } from 'redux';
+import type { ThunkDispatch } from 'redux-thunk';
 import { createSelector } from 'reselect';
 
 import type { Annotation } from '../../../types/api';
@@ -105,7 +105,10 @@ function createDraft(annotation: AnnotationID, changes: DraftChanges) {
  * An empty draft has no text and no reference tags.
  */
 function deleteNewAndEmptyDrafts() {
-  return (dispatch: Dispatch, getState: () => { drafts: State }) => {
+  return (
+    dispatch: ThunkDispatch<{ drafts: State }, void, any>,
+    getState: () => { drafts: State },
+  ) => {
     const newDrafts = getState().drafts.drafts.filter(draft => {
       return (
         !draft.annotation.id &&

src/sidebar/store/modules/frames.ts

-import {
-  createSelector,
-  createSelectorCreator,
-  defaultMemoize,
-} from 'reselect';
+import { createSelector, createSelectorCreator, lruMemoize } from 'reselect';
 import shallowEqual from 'shallowequal';
 
 import type {
@@ -197,7 +193,7 @@ function searchUrisForFrame(frame: Frame): string[] {
 
 // "selector creator" that uses `shallowEqual` instead of `===` for memoization
 const createShallowEqualSelector = createSelectorCreator(
-  defaultMemoize,
+  lruMemoize,
   shallowEqual,
 );
 

src/tsconfig.json

@@ -21,7 +21,7 @@
     // Prevent automatic inclusion of global variables defined in `@types/<name>` packages.
     // This prevents eg. Node globals from `@types/node` being included when writing
     // code for the browser.
-    "types": ["redux-thunk/extend-redux"]
+    "types": []
   },
   "include": ["**/*.js", "**/*.ts", "**/*.tsx", "types/*.d.ts"],
   "exclude": [