Setting for forceRefresh (#36)

* Allows setting `forceRefresh`-option to `browserHistory` through Roc settings * Fixes ESLint mistake
rocjs · Oct 11, 2016 · 518f9c5 · 518f9c5
1 parent 04ed9c6
commit 518f9c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/extensions/roc-package-web-app-react/app/client/create-client.js b/extensions/roc-package-web-app-react/app/client/create-client.js
@@ -75,8 +75,12 @@ export default function createClient({ createRoutes, createStore, mountNode }) {
     const render = () => {
         const node = document.getElementById(mountNode);
 
+        const forceRefreshSetting = rocConfig.runtime.history.forceRefresh;
         let history = useRouterHistory(createHistory)({
             basename,
+            forceRefresh: typeof forceRefreshSetting === 'function'
+                ? forceRefreshSetting()
+                : forceRefreshSetting,
         });
 
         let initialLoading = null;

diff --git a/extensions/roc-package-web-app-react/src/config/roc.config.js b/extensions/roc-package-web-app-react/src/config/roc.config.js
@@ -31,6 +31,9 @@ export default {
             debug: {
                 client: 'roc:*',
             },
+            history: {
+                forceRefresh: undefined,
+            },
             configWhitelistProperty: 'DANGEROUSLY_EXPOSE_TO_CLIENT',
             fetch: {
                 server: ['fetch'],

diff --git a/extensions/roc-package-web-app-react/src/config/roc.config.meta.js b/extensions/roc-package-web-app-react/src/config/roc.config.meta.js
@@ -1,4 +1,4 @@
-import { isString, isBoolean, isPath, isArray, isObject, notEmpty, required } from 'roc/validators';
+import { isString, isBoolean, isPath, isArray, isObject, notEmpty, required, oneOf, isFunction } from 'roc/validators';
 
 export default {
     settings: {
@@ -103,6 +103,12 @@ export default {
                     },
                 },
             },
+            history: {
+                forceRefresh: {
+                    description: 'Whether to force load from server rather than do single page navigation',
+                    validator: oneOf(isBoolean, isFunction),
+                },
+            },
         },
     },
 };