Merge branch '2.0' of https://github.com/transloadit/uppy into 2.0

* '2.0' of https://github.com/transloadit/uppy:
  @uppy/store-redux: force `new` keyword

packages/@uppy/store-redux/src/index.js

@@ -77,10 +77,8 @@ function middleware () {
   }
 }
 
-module.exports = function createReduxStore (opts) {
-  return new ReduxStore(opts)
-}
-
+module.exports = ReduxStore
+module.exports.ReduxStore = ReduxStore
 module.exports.STATE_UPDATE = STATE_UPDATE
 module.exports.reducer = reducer
 module.exports.middleware = middleware

packages/@uppy/store-redux/src/index.test.js

@@ -7,9 +7,9 @@ describe('ReduxStore', () => {
     return Redux.createStore(reducer)
   }
 
-  it('can be created with or without new', () => {
+  it('can be created with named or default import', () => {
     const r = createStore()
-    let store = ReduxStore({ store: r })
+    let store = new ReduxStore.ReduxStore({ store: r })
     expect(typeof store).toBe('object')
     store = new ReduxStore({ store: r })
     expect(typeof store).toBe('object')
@@ -17,7 +17,7 @@ describe('ReduxStore', () => {
 
   it('merges in state using `setState`', () => {
     const r = createStore()
-    const store = ReduxStore({ store: r })
+    const store = new ReduxStore({ store: r })
     expect(store.getState()).toEqual({})
 
     store.setState({
@@ -39,7 +39,7 @@ describe('ReduxStore', () => {
     }
 
     const r = createStore()
-    const store = ReduxStore({ store: r })
+    const store = new ReduxStore({ store: r })
     store.subscribe(listener)
 
     expected = [{}, { a: 1, b: 2 }, { a: 1, b: 2 }]
@@ -70,7 +70,7 @@ describe('ReduxStore', () => {
       expect([prevState, nextState, patch]).toEqual(expected)
     }
 
-    const store = ReduxStore({ store: r })
+    const store = new ReduxStore({ store: r })
     store.subscribe(listener)
 
     expected = [{}, { a: 1 }, { a: 1 }]
@@ -95,7 +95,7 @@ describe('ReduxStore', () => {
       hello: ReduxStore.reducer,
     })
     const r = Redux.createStore(reducer)
-    const store = ReduxStore({
+    const store = new ReduxStore({
       store: r,
       id: 'world',
       selector: state => state.hello.world,

packages/@uppy/store-redux/types/index.d.ts

@@ -1,27 +1,21 @@
 import type { Store } from '@uppy/utils'
 import type { Reducer, Middleware, Store as Redux } from 'redux'
 
-declare namespace ReduxStore {
-  interface ReduxStoreOptions {
-    store: Redux<object>
-    id?: string
-    selector?: (state: any) => object
-  }
-
-  interface ReduxStore extends Store {
-    constructor (opts: ReduxStoreOptions): ReduxStore
-    getState (): object
-    setState (patch: object): void
-    subscribe (listener: any): () => void
-  }
+interface ReduxStoreOptions {
+  store: Redux<object>
+  id?: string
+  selector?: (state: any) => object
+}
 
-  const reducer: Reducer<object>
-  const middleware: Middleware
-  const STATE_UPDATE: string
+export class ReduxStore implements Store {
+  constructor (opts: ReduxStoreOptions)
+  getState (): object
+  setState (patch: object): void
+  subscribe (listener: any): () => void
 }
 
-declare function ReduxStore (
-  opts: ReduxStore.ReduxStoreOptions
-): ReduxStore.ReduxStore
+export const reducer: Reducer<any>
+export const middleware: Middleware
+export const STATE_UPDATE: string
 
 export default ReduxStore

packages/@uppy/store-redux/types/index.test-d.ts

@@ -1,12 +1,10 @@
 import { createStore, combineReducers } from 'redux'
-import ReduxStore from '../'
+import ReduxStore, { reducer as uppy } from '..'
 
-const reducer = combineReducers({
-  uppy: ReduxStore.reducer
-})
+const reducer = combineReducers({ uppy })
 
-const store = ReduxStore({
-  store: createStore(reducer)
+const store = new ReduxStore({
+  store: createStore(reducer),
 })
 
 store.setState({ a: 1 })