From 2f2f09e4f94137a59e62f2b77515e5b77ef185ac Mon Sep 17 00:00:00 2001
From: Glenn Vorhes <gavorhes@wisc.edu>
Date: Thu, 31 Aug 2017 21:23:12 -0500
Subject: [PATCH] fix react and redux entry convenience point

---
 dist/reactComponents/reactAndRedux.d.ts   | 3 +--
 dist/reactComponents/reactAndRedux.js     | 1 -
 dist/reactComponents/reactAndRedux.js.map | 2 +-
 src/reactComponents/reactAndRedux.ts      | 8 +-------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dist/reactComponents/reactAndRedux.d.ts b/dist/reactComponents/reactAndRedux.d.ts
index 49ee029..3b1d3f4 100644
--- a/dist/reactComponents/reactAndRedux.d.ts
+++ b/dist/reactComponents/reactAndRedux.d.ts
@@ -9,6 +9,5 @@ export declare const connect: any;
 export declare const Provider: any;
 export declare const combineReducers: typeof Redux.combineReducers;
 export declare const createStore: Redux.StoreCreator;
-export interface iAction {
-    type: string;
+export interface iAction extends Redux.Action {
 }
diff --git a/dist/reactComponents/reactAndRedux.js b/dist/reactComponents/reactAndRedux.js
index 5889d9e..b9bba1e 100644
--- a/dist/reactComponents/reactAndRedux.js
+++ b/dist/reactComponents/reactAndRedux.js
@@ -9,7 +9,6 @@ exports.ReactRedux = require("react-redux");
 exports.Redux = require("redux");
 exports.connect = exports.ReactRedux.connect;
 exports.Provider = exports.ReactRedux.Provider;
-// export { connect, Provider } from 'react-redux';
 exports.combineReducers = exports.Redux.combineReducers;
 exports.createStore = exports.Redux.createStore;
 //# sourceMappingURL=reactAndRedux.js.map
\ No newline at end of file
diff --git a/dist/reactComponents/reactAndRedux.js.map b/dist/reactComponents/reactAndRedux.js.map
index d941b75..cc115c3 100644
--- a/dist/reactComponents/reactAndRedux.js.map
+++ b/dist/reactComponents/reactAndRedux.js.map
@@ -1 +1 @@
-{"version":3,"file":"reactAndRedux.js","sourceRoot":"","sources":["../../src/reactComponents/reactAndRedux.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,iCAAuC;AACvC,wCAA8C;AAC9C,4CAAkD;AAClD,iCAAuC;AAI1B,QAAA,OAAO,GAAG,kBAAU,CAAC,OAAO,CAAC;AAC7B,QAAA,QAAQ,GAAG,kBAAU,CAAC,QAAQ,CAAC;AAC5C,mDAAmD;AACtC,QAAA,eAAe,GAAG,aAAK,CAAC,eAAe,CAAC;AACxC,QAAA,WAAW,GAAG,aAAK,CAAC,WAAW,CAAC","sourcesContent":["/**\r\n * Created by glenn on 6/12/2017.\r\n */\r\nexport import React = require('react');\r\nexport import ReactDom = require('react-dom');\r\nexport import ReactRedux = require('react-redux');\r\nexport import Redux = require('redux');\r\n\r\n\r\n\r\nexport const connect = ReactRedux.connect;\r\nexport const Provider = ReactRedux.Provider;\r\n// export { connect, Provider } from 'react-redux';\r\nexport const combineReducers = Redux.combineReducers;\r\nexport const createStore = Redux.createStore;\r\n\r\n// export {combineReducers, createStore, Store, } from 'redux';\r\n\r\nexport interface iAction{\r\n    type: string;\r\n}\r\n\r\n\r\n"]}
\ No newline at end of file
+{"version":3,"file":"reactAndRedux.js","sourceRoot":"","sources":["../../src/reactComponents/reactAndRedux.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,iCAAuC;AACvC,wCAA8C;AAC9C,4CAAkD;AAClD,iCAAuC;AAE1B,QAAA,OAAO,GAAG,kBAAU,CAAC,OAAO,CAAC;AAC7B,QAAA,QAAQ,GAAG,kBAAU,CAAC,QAAQ,CAAC;AAC/B,QAAA,eAAe,GAAG,aAAK,CAAC,eAAe,CAAC;AACxC,QAAA,WAAW,GAAG,aAAK,CAAC,WAAW,CAAC","sourcesContent":["/**\r\n * Created by glenn on 6/12/2017.\r\n */\r\nexport import React = require('react');\r\nexport import ReactDom = require('react-dom');\r\nexport import ReactRedux = require('react-redux');\r\nexport import Redux = require('redux');\r\n\r\nexport const connect = ReactRedux.connect;\r\nexport const Provider = ReactRedux.Provider;\r\nexport const combineReducers = Redux.combineReducers;\r\nexport const createStore = Redux.createStore;\r\n\r\nexport interface iAction extends Redux.Action{\r\n}\r\n\r\n\r\n"]}
\ No newline at end of file
diff --git a/src/reactComponents/reactAndRedux.ts b/src/reactComponents/reactAndRedux.ts
index ec65106..28169af 100644
--- a/src/reactComponents/reactAndRedux.ts
+++ b/src/reactComponents/reactAndRedux.ts
@@ -6,18 +6,12 @@ export import ReactDom = require('react-dom');
 export import ReactRedux = require('react-redux');
 export import Redux = require('redux');
 
-
-
 export const connect = ReactRedux.connect;
 export const Provider = ReactRedux.Provider;
-// export { connect, Provider } from 'react-redux';
 export const combineReducers = Redux.combineReducers;
 export const createStore = Redux.createStore;
 
-// export {combineReducers, createStore, Store, } from 'redux';
-
-export interface iAction{
-    type: string;
+export interface iAction extends Redux.Action{
 }
 
 
-- 
GitLab