resolves #71

resolves #67
resolves #79

Author: quisido

default.d.ts

@@ -1,5 +1,4 @@
-import { NewGlobalState } from './src/global-state-manager';
-import { Dispatchers } from './src/typings/reducer';
+import Dispatchers from './typings/dispatchers';
 
 export type Dispatch = Dispatchers<State, Reducers>;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactn",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Charles Stover <[email protected]>",
   "description": "React, but with built-in global state management.",
   "homepage": "https://github.com/CharlesStover/reactn#readme",
@@ -18,6 +18,7 @@
   },
   "files": [
     "build",
+    "typings",
     "default.d.ts",
     "package.json"
   ],
@@ -46,8 +47,6 @@
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-testing-library": "^6.0.4",
-    "redux": "^4.0.1",
-    "redux-devtools-extension": "^2.13.8",
     "ts-jest": "^24.0.1",
     "ts-node": "^8.0.2",
     "typescript": "^3.3.1"

src/add-callback.ts

@@ -1,6 +1,6 @@
 import { State } from '../default';
+import Callback from '../typings/callback';
 import GlobalStateManager from './global-state-manager';
-import Callback from './typings/callback';
 
 
 

src/add-reducer.ts

@@ -1,6 +1,6 @@
 import { State } from '../default';
+import Reducer from '../typings/reducer';
 import GlobalStateManager from './global-state-manager';
-import Reducer from './typings/reducer';
 
 
 

src/add-reducers.ts

@@ -1,7 +1,7 @@
 import { Reducers, State } from '../default';
+import { AdditionalReducers } from '../typings/reducer';
 import addReducer from './add-reducer';
 import GlobalStateManager from './global-state-manager';
-import { AdditionalReducers } from './typings/reducer';
 
 
 
@@ -14,7 +14,7 @@ export default function addReducers<
   R extends {} = Reducers,
 >(
   globalStateManager: GlobalStateManager<G, R>,
-  reducers: AdditionalReducers<G, R>,
+  reducers: AdditionalReducers<G, R & any>,
 ): BooleanFunction {
 
   // Amalgamate all the functions to remove these reducers.

src/components.ts

@@ -1,6 +1,8 @@
 import { Reducers, State } from '../default';
+import Callback from '../typings/callback';
+import { DispatcherMap } from '../typings/dispatchers';
+import NewGlobalState from '../typings/new-global-state';
 import { Component, ComponentClass, PureComponent } from 'react';
-import { NewGlobalState } from './global-state-manager';
 import {
   ReactNComponentWillUnmount,
   ReactNComponentWillUpdate,
@@ -9,8 +11,6 @@ import {
   ReactNGlobalCallback,
   ReactNSetGlobal,
 } from './methods';
-import Callback from './typings/callback';
-import { DispatcherMap } from './typings/reducer';
 
 
 

src/create-provider.tsx

@@ -1,17 +1,15 @@
 import { Reducers, State } from '../default';
+import Callback from '../typings/callback';
+import Dispatcher, { ExtractArguments } from '../typings/dispatcher';
+import Dispatchers from '../typings/dispatchers';
+import NewGlobalState from '../typings/new-global-state';
+import Reducer, { AdditionalReducers } from '../typings/reducer';
 import * as React from 'react';
 import Context from './context';
 import addReducer from './add-reducer';
 import addReducers from './add-reducers';
-import GlobalStateManager, { NewGlobalState } from './global-state-manager';
+import GlobalStateManager from './global-state-manager';
 import setGlobal from './set-global';
-import Callback from './typings/callback';
-import Reducer, {
-  AdditionalReducers,
-  Dispatcher,
-  Dispatchers,
-  ExtractArguments,
-} from './typings/reducer';
 import useDispatch, { UseDispatch } from './use-dispatch';
 import useGlobal, { GlobalTuple, StateTuple, UseGlobal } from './use-global';
 import REACT_CONTEXT_ERROR from './utils/react-context-error';

src/decorator.ts

@@ -1,4 +1,7 @@
 import { Reducers, State } from '../default';
+import Callback from '../typings/callback';
+import Dispatchers from '../typings/dispatchers';
+import NewGlobalState from '../typings/new-global-state';
 import { ComponentClass } from 'react';
 import { ReactNComponentClass } from './components';
 import {
@@ -10,9 +13,6 @@ import {
   ReactNGlobalCallback,
   ReactNSetGlobal,
 } from './methods';
-import { NewGlobalState } from './global-state-manager';
-import Callback from './typings/callback';
-import { Dispatchers } from './typings/reducer';
 
 
 

src/get-dispatch.ts

@@ -1,5 +1,5 @@
 import { Reducers, State } from '../default';
-import { Dispatchers } from './typings/reducer';
+import Dispatchers from '../typings/dispatchers';
 import GlobalStateManager from './global-state-manager';