Merge pull request #7 from react-boilerplate/dev

Merge dev to master

Author: BenLorantfy

.travis.yml

@@ -6,8 +6,8 @@ node_js:
 
 script:
   - npm test -- --maxWorkers=4
-  - npm run build
   - npm run lint
+  - npm run build
 
 cache:
   directories:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-injectors",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "types": "index.d.ts",
@@ -13,7 +13,7 @@
     "test": "jest",
     "lint": "eslint ./src",
     "prettify": "prettier --write",
-    "prepublishOnly": "npm run test && npm run build"
+    "prepublishOnly": "./scripts/check-on-master.sh && npm run test && npm run build"
   },
   "files": [
     "dist",

package.json

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Check to make sure we are on the master branch
+# See: https://stackoverflow.com/a/34658774/3006989
+current_branch=$(git branch | grep '*');
+
+if [ "$current_branch" != "* (HEAD detached at origin/master)" -a "$current_branch" != "* master" ]; then
+    echo "Not on master - cannot proceed, please change to master by using:\n\n     git checkout master\n"
+    exit 1
+fi

scripts/check-on-master.sh

@@ -67,9 +67,13 @@ export default ({ key, reducer }) => WrappedComponent => {
  */
 const useInjectReducer = ({ key, reducer }) => {
   const store = useStore();
-  React.useEffect(() => {
+
+  const isInjected = React.useRef(false);
+
+  if (!isInjected.current) {
     getInjectors(store).injectReducer(key, reducer);
-  }, []);
+    isInjected.current = true;
+  }
 };
 
 export { useInjectReducer };

src/injectReducer.js

@@ -83,14 +83,20 @@ export default ({ key, saga, mode }) => WrappedComponent => {
  */
 const useInjectSaga = ({ key, saga, mode }) => {
   const store = useStore();
-  React.useEffect(() => {
-    const injectors = getInjectors(store);
-    injectors.injectSaga(key, { saga, mode });
 
-    return () => {
-      injectors.ejectSaga(key);
-    };
-  }, []);
+  const isInjected = React.useRef(false);
+
+  if (!isInjected.current) {
+    getInjectors(store).injectSaga(key, { saga, mode });
+    isInjected.current = true;
+  }
+
+  React.useEffect(
+    () => () => {
+      getInjectors(store).ejectSaga(key);
+    },
+    [],
+  );
 };
 
 export { useInjectSaga };