@zengenti/contensis-react-base 2.5.1-beta.3 → 3.0.0-beta.2

package/esm/client.js

@@ -1,64 +1,40 @@
 import 'isomorphic-fetch';
-import { preloadReady } from 'react-loadable';
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import 'react-router-config';
 import 'jsonpath-mapper';
-import 'immutable';
 import 'redux';
-import 'redux-immutable';
 import 'redux-thunk';
 import 'redux-saga';
 import 'redux-injectors';
-import { c as createStore, s as setVersionStatus } from './version-64906b26.js';
-import { s as setCurrentProject } from './actions-ddd9c623.js';
-import { o as fromJSOrdered } from './reducers-feab84fc.js';
+import 'immer';
+import { c as createStore, s as setVersionStatus } from './version-cb9cd09d.js';
+import { s as setCurrentProject } from './actions-3cc39599.js';
+import './reducers-d6c0edb1.js';
 import 'history';
-import { d as deliveryApi, r as rootSaga, p as pickProject, b as browserHistory } from './App-fbef99b3.js';
-export { A as ReactApp } from './App-fbef99b3.js';
+import { d as deliveryApi, b as browserHistory, r as rootSaga, p as pickProject } from './App-122f28a3.js';
+export { A as ReactApp } from './App-122f28a3.js';
 import '@redux-saga/core/effects';
 import 'contensis-delivery-api';
-import './version-7fdbd2d5.js';
+import './selectors-82e71d8e.js';
+import './version-59c8f9be.js';
 import { parse } from 'query-string';
-import './selectors-68799788.js';
 import 'loglevel';
-import './ToJs-6e7b247c.js';
-import './login-1f9ad133.js';
+import './ToJs-52fee252.js';
+import './login-92db44d1.js';
 import 'await-to-js';
 import 'js-cookie';
 import { AppContainer } from 'react-hot-loader';
-import './RouteLoader-281d47e1.js';
+import './RouteLoader-c2faac87.js';
 import { hydrate, render } from 'react-dom';
-
-const fromJSLeaveImmer = js => {
-  // console.info(js);
-  // if (typeof js !== 'object' || js === null) return js;
-  // // console.info(`from js - here is js ${JSON.stringify(js)}`);
-  // const convertedObject = isOrdered ? OrderedMap() : fromJS({});
-  // const keys = Object.keys(js);
-  // keys.forEach(key => {
-  //   if (key === 'immer') {
-  //     convertedObject.set(key, js[key]);
-  //     // console.info(`LOOK! - immer untouched bar root key "${key}"`);
-  //   } else {
-  //     // console.info(`LOOK! - normal immutable feature "${key}"`);
-  //     convertedObject.set(key, isOrdered ? fromJSOrdered(js) : fromJS(js));
-  //   }
-  // });
-  const immutableObj = fromJSOrdered(js);
-
-  if (immutableObj && !!immutableObj.get('immer')) {
-    immutableObj.set('immer', immutableObj.get('immer').toJS());
-  }
-
-  return immutableObj;
-};
+import { loadableReady } from '@loadable/component';
 
 class ClientApp {
   constructor(ReactApp, config) {
     const documentRoot = document.getElementById('root');
     const {
+      stateType = 'immutable',
       routes,
       withReducers,
       withSagas,
@@ -83,27 +59,40 @@ class ClientApp {
      */
 
     const HMRRenderer = Component => {
-      preloadReady().then(() => {
-        if (isProduction) hydrate(Component, documentRoot);else render(Component, documentRoot);
-      });
+      if (isProduction) loadableReady(() => {
+        hydrate(Component, documentRoot);
+      }, {
+        namespace: 'modern'
+      });else render(Component, documentRoot);
+    };
+
+    const hmr = store => {
+      // webpack Hot Module Replacement API
+      if (module.hot) {
+        module.hot.accept(ReactApp, () => {
+          // if you are using harmony modules ({modules:false})
+          HMRRenderer(GetClientJSX(store));
+        });
+      }
     };
 
-    let store = null;
     const qs = parse(window.location.search);
     const versionStatusFromHostname = deliveryApi.getClientSideVersionStatus();
 
     if (window.isDynamic || window.REDUX_DATA || process.env.NODE_ENV !== 'production') {
-      store = createStore(withReducers, fromJSLeaveImmer(window.REDUX_DATA), browserHistory);
-      store.dispatch(setVersionStatus(qs.versionStatus || versionStatusFromHostname));
-      /* eslint-disable no-console */
+      createStore(withReducers, window.REDUX_DATA, browserHistory, stateType).then(store => {
+        store.dispatch(setVersionStatus(qs.versionStatus || versionStatusFromHostname));
+        /* eslint-disable no-console */
 
-      console.log('Hydrating from inline Redux');
-      /* eslint-enable no-console */
+        console.log('Hydrating from inline Redux');
+        /* eslint-enable no-console */
 
-      store.runSaga(rootSaga(withSagas));
-      store.dispatch(setCurrentProject(pickProject(window.location.hostname, qs), [], window.location.hostname));
-      delete window.REDUX_DATA;
-      HMRRenderer(GetClientJSX(store));
+        store.runSaga(rootSaga(withSagas));
+        store.dispatch(setCurrentProject(pickProject(window.location.hostname, qs), [], window.location.hostname));
+        delete window.REDUX_DATA;
+        HMRRenderer(GetClientJSX(store));
+        hmr(store);
+      });
     } else {
       fetch(`${window.location.pathname}?redux=true`).then(response => response.json()).then(data => {
         /* eslint-disable no-console */
@@ -112,22 +101,16 @@ class ClientApp {
 
         /* eslint-enable no-console */
         const ssRedux = JSON.parse(data);
-        store = createStore(withReducers, fromJSLeaveImmer(ssRedux), browserHistory); // store.dispatch(setVersionStatus(versionStatusFromHostname));
-
-        store.runSaga(rootSaga(withSagas));
-        store.dispatch(setCurrentProject(pickProject(window.location.hostname, parse(window.location.search)), [], window.location.hostname)); // if (typeof window != 'undefined') {
-        //   store.dispatch(checkUserLoggedIn());
-        // }
-
-        HMRRenderer(GetClientJSX(store));
-      });
-    } // webpack Hot Module Replacement API
-
-
-    if (module.hot) {
-      module.hot.accept(ReactApp, () => {
-        // if you are using harmony modules ({modules:false})
-        HMRRenderer(GetClientJSX(store));
+        createStore(withReducers, ssRedux, browserHistory, stateType).then(store => {
+          // store.dispatch(setVersionStatus(versionStatusFromHostname));
+          store.runSaga(rootSaga(withSagas));
+          store.dispatch(setCurrentProject(pickProject(window.location.hostname, parse(window.location.search)), [], window.location.hostname)); // if (typeof window != 'undefined') {
+          //   store.dispatch(checkUserLoggedIn());
+          // }
+
+          HMRRenderer(GetClientJSX(store));
+          hmr(store);
+        });
       });
     }
   }

package/esm/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../src/util/fromJSLeaveImmer.js","../src/client/client.tsx"],"sourcesContent":["import fromJSOrdered from './fromJSOrdered';\n\nconst fromJSLeaveImmer = js => {\n  // console.info(js);\n  // if (typeof js !== 'object' || js === null) return js;\n  // // console.info(`from js - here is js ${JSON.stringify(js)}`);\n  // const convertedObject = isOrdered ? OrderedMap() : fromJS({});\n  // const keys = Object.keys(js);\n  // keys.forEach(key => {\n  //   if (key === 'immer') {\n  //     convertedObject.set(key, js[key]);\n  //     // console.info(`LOOK! - immer untouched bar root key \"${key}\"`);\n  //   } else {\n  //     // console.info(`LOOK! - normal immutable feature \"${key}\"`);\n  //     convertedObject.set(key, isOrdered ? fromJSOrdered(js) : fromJS(js));\n  //   }\n  // });\n  const immutableObj = fromJSOrdered(js);\n  if (immutableObj && !!immutableObj.get('immer')) {\n    immutableObj.set('immer', immutableObj.get('immer').toJS());\n  }\n  return immutableObj;\n};\nexport default fromJSLeaveImmer;\n","import 'isomorphic-fetch';\nimport React from 'react';\nimport { render, hydrate } from 'react-dom';\nimport { Router } from 'react-router-dom';\nimport { preloadReady } from 'react-loadable';\nimport { AppContainer } from 'react-hot-loader';\nimport { Provider as ReduxProvider } from 'react-redux';\nimport * as queryString from 'query-string';\n// import { fromJS } from 'immutable';\n\nimport createStore from '~/redux/store/store';\nimport { browserHistory as history } from '~/redux/store/history';\nimport rootSaga from '~/redux/sagas';\n\nimport { setVersionStatus } from '~/redux/actions/version';\nimport { deliveryApi } from '~/util/ContensisDeliveryApi';\nimport { setCurrentProject } from '~/routing/redux/actions';\nimport pickProject from '~/util/pickProject';\n// import fromJSOrdered from '~/util/fromJSOrdered';\nimport fromJSLeaveImmer from '~/util/fromJSLeaveImmer';\n\nimport { AppConfig } from '~/config';\n\ndeclare let window: typeof globalThis & {\n  isDynamic;\n  REDUX_DATA;\n};\n\ntype ReactAppProps = { routes: any; withEvents: any };\n\nclass ClientApp {\n  constructor(ReactApp: React.ComponentType<ReactAppProps>, config: AppConfig) {\n    const documentRoot = document.getElementById('root');\n\n    const { routes, withReducers, withSagas, withEvents } = config;\n\n    const GetClientJSX = store => {\n      const ClientJsx = (\n        <AppContainer>\n          <ReduxProvider store={store}>\n            <Router history={history}>\n              <ReactApp routes={routes} withEvents={withEvents} />\n            </Router>\n          </ReduxProvider>\n        </AppContainer>\n      );\n      return ClientJsx;\n    };\n\n    const isProduction = !(process.env.NODE_ENV !== 'production');\n\n    /**\n     * Webpack HMR Setup.\n     */\n    const HMRRenderer = Component => {\n      preloadReady().then(() => {\n        if (isProduction) hydrate(Component, documentRoot);\n        else render(Component, documentRoot);\n      });\n    };\n    let store: any = null;\n    const qs = queryString.parse(window.location.search);\n\n    const versionStatusFromHostname = deliveryApi.getClientSideVersionStatus();\n    if (\n      window.isDynamic ||\n      window.REDUX_DATA ||\n      process.env.NODE_ENV !== 'production'\n    ) {\n      store = createStore(\n        withReducers,\n        fromJSLeaveImmer(window.REDUX_DATA),\n        history\n      );\n      store.dispatch(\n        setVersionStatus(qs.versionStatus || versionStatusFromHostname)\n      );\n\n      /* eslint-disable no-console */\n      console.log('Hydrating from inline Redux');\n      /* eslint-enable no-console */\n      store.runSaga(rootSaga(withSagas));\n      store.dispatch(\n        setCurrentProject(\n          pickProject(window.location.hostname, qs),\n          [],\n          window.location.hostname\n        )\n      );\n\n      delete window.REDUX_DATA;\n      HMRRenderer(GetClientJSX(store));\n    } else {\n      fetch(`${window.location.pathname}?redux=true`)\n        .then(response => response.json())\n        .then(data => {\n          /* eslint-disable no-console */\n          // console.log('Got Data Back');\n          // console.log(data);\n          /* eslint-enable no-console */\n          const ssRedux = JSON.parse(data);\n          store = createStore(withReducers, fromJSLeaveImmer(ssRedux), history);\n          // store.dispatch(setVersionStatus(versionStatusFromHostname));\n\n          store.runSaga(rootSaga(withSagas));\n          store.dispatch(\n            setCurrentProject(\n              pickProject(\n                window.location.hostname,\n                queryString.parse(window.location.search)\n              ),\n              [],\n              window.location.hostname\n            )\n          );\n          // if (typeof window != 'undefined') {\n          //   store.dispatch(checkUserLoggedIn());\n          // }\n          HMRRenderer(GetClientJSX(store));\n        });\n    }\n\n    // webpack Hot Module Replacement API\n    if (module.hot) {\n      module.hot.accept(ReactApp as unknown as string, () => {\n        // if you are using harmony modules ({modules:false})\n        HMRRenderer(GetClientJSX(store));\n      });\n    }\n  }\n}\n\nexport default ClientApp;\n"],"names":["fromJSLeaveImmer","js","immutableObj","fromJSOrdered","get","set","toJS","ClientApp","constructor","ReactApp","config","documentRoot","document","getElementById","routes","withReducers","withSagas","withEvents","GetClientJSX","store","ClientJsx","ReduxProvider","history","isProduction","process","env","NODE_ENV","HMRRenderer","Component","preloadReady","then","hydrate","render","qs","queryString","window","location","search","versionStatusFromHostname","deliveryApi","getClientSideVersionStatus","isDynamic","REDUX_DATA","createStore","dispatch","setVersionStatus","versionStatus","console","log","runSaga","rootSaga","setCurrentProject","pickProject","hostname","fetch","pathname","response","json","data","ssRedux","JSON","parse","module","hot","accept"],"mappings":"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"}
+{"version":3,"file":"client.js","sources":["../src/client/client.tsx"],"sourcesContent":["import 'isomorphic-fetch';\nimport React from 'react';\nimport { render, hydrate } from 'react-dom';\nimport { AppContainer } from 'react-hot-loader';\nimport { Provider as ReduxProvider } from 'react-redux';\nimport { Router } from 'react-router-dom';\nimport { loadableReady } from '@loadable/component';\nimport * as queryString from 'query-string';\n\nimport { setVersionStatus } from '~/redux/actions/version';\nimport rootSaga from '~/redux/sagas';\nimport { browserHistory as history } from '~/redux/store/history';\nimport createStore from '~/redux/store/store';\n\nimport { setCurrentProject } from '~/routing/redux/actions';\n\nimport { deliveryApi } from '~/util/ContensisDeliveryApi';\nimport pickProject from '~/util/pickProject';\n\nimport { AppConfig } from '~/config';\n\ndeclare let window: typeof globalThis & {\n  isDynamic;\n  REDUX_DATA;\n};\n\ntype ReactAppProps = { routes: any; withEvents: any };\n\nclass ClientApp {\n  constructor(ReactApp: React.ComponentType<ReactAppProps>, config: AppConfig) {\n    const documentRoot = document.getElementById('root');\n\n    const {\n      stateType = 'immutable',\n      routes,\n      withReducers,\n      withSagas,\n      withEvents,\n    } = config;\n\n    const GetClientJSX = store => {\n      const ClientJsx = (\n        <AppContainer>\n          <ReduxProvider store={store}>\n            <Router history={history}>\n              <ReactApp routes={routes} withEvents={withEvents} />\n            </Router>\n          </ReduxProvider>\n        </AppContainer>\n      );\n      return ClientJsx;\n    };\n\n    const isProduction = !(process.env.NODE_ENV !== 'production');\n\n    /**\n     * Webpack HMR Setup.\n     */\n    const HMRRenderer = Component => {\n      if (isProduction)\n        loadableReady(\n          () => {\n            hydrate(Component, documentRoot);\n          },\n          { namespace: 'modern' }\n        );\n      else render(Component, documentRoot);\n    };\n\n    const hmr = store => {\n      // webpack Hot Module Replacement API\n      if (module.hot) {\n        module.hot.accept(ReactApp as unknown as string, () => {\n          // if you are using harmony modules ({modules:false})\n          HMRRenderer(GetClientJSX(store));\n        });\n      }\n    };\n\n    const qs = queryString.parse(window.location.search);\n    const versionStatusFromHostname = deliveryApi.getClientSideVersionStatus();\n\n    if (\n      window.isDynamic ||\n      window.REDUX_DATA ||\n      process.env.NODE_ENV !== 'production'\n    ) {\n      createStore(withReducers, window.REDUX_DATA, history, stateType).then(\n        store => {\n          store.dispatch(\n            setVersionStatus(qs.versionStatus || versionStatusFromHostname)\n          );\n\n          /* eslint-disable no-console */\n          console.log('Hydrating from inline Redux');\n          /* eslint-enable no-console */\n          store.runSaga(rootSaga(withSagas));\n          store.dispatch(\n            setCurrentProject(\n              pickProject(window.location.hostname, qs),\n              [],\n              window.location.hostname\n            )\n          );\n\n          delete window.REDUX_DATA;\n          HMRRenderer(GetClientJSX(store));\n\n          hmr(store);\n        }\n      );\n    } else {\n      fetch(`${window.location.pathname}?redux=true`)\n        .then(response => response.json())\n        .then(data => {\n          /* eslint-disable no-console */\n          // console.log('Got Data Back');\n          // console.log(data);\n          /* eslint-enable no-console */\n          const ssRedux = JSON.parse(data);\n          createStore(withReducers, ssRedux, history, stateType).then(store => {\n            // store.dispatch(setVersionStatus(versionStatusFromHostname));\n\n            store.runSaga(rootSaga(withSagas));\n            store.dispatch(\n              setCurrentProject(\n                pickProject(\n                  window.location.hostname,\n                  queryString.parse(window.location.search)\n                ),\n                [],\n                window.location.hostname\n              )\n            );\n            // if (typeof window != 'undefined') {\n            //   store.dispatch(checkUserLoggedIn());\n            // }\n            HMRRenderer(GetClientJSX(store));\n\n            hmr(store);\n          });\n        });\n    }\n  }\n}\n\nexport default ClientApp;\n"],"names":["ClientApp","constructor","ReactApp","config","documentRoot","document","getElementById","stateType","routes","withReducers","withSagas","withEvents","GetClientJSX","store","ClientJsx","ReduxProvider","history","isProduction","process","env","NODE_ENV","HMRRenderer","Component","loadableReady","hydrate","namespace","render","hmr","module","hot","accept","qs","queryString","window","location","search","versionStatusFromHostname","deliveryApi","getClientSideVersionStatus","isDynamic","REDUX_DATA","createStore","then","dispatch","setVersionStatus","versionStatus","console","log","runSaga","rootSaga","setCurrentProject","pickProject","hostname","fetch","pathname","response","json","data","ssRedux","JSON","parse"],"mappings":"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"}

package/esm/contensis-react-base.js

@@ -1,6 +1,5 @@
 import 'isomorphic-fetch';
 import express from 'express';
-import Loadable from 'react-loadable';
 import httpProxy from 'http-proxy';
 import fs from 'fs';
 import path from 'path';
@@ -10,36 +9,35 @@ import { renderToString } from 'react-dom/server';
 import { StaticRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { matchRoutes } from 'react-router-config';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 import { ServerStyleSheet } from 'styled-components';
 import serialize from 'serialize-javascript';
 import minifyCssString from 'minify-css-string';
 import mapJson from 'jsonpath-mapper';
 import { ChunkExtractor, ChunkExtractorManager } from '@loadable/server';
-import { fromJS } from 'immutable';
 import 'redux';
-import 'redux-immutable';
 import 'redux-thunk';
 import 'redux-saga';
 import 'redux-injectors';
-import { c as createStore, s as setVersionStatus, a as setVersion } from './version-64906b26.js';
-import { s as setCurrentProject } from './actions-ddd9c623.js';
-import './reducers-feab84fc.js';
+import 'immer';
+import { c as createStore, s as setVersionStatus, a as setVersion } from './version-cb9cd09d.js';
+import { s as setCurrentProject } from './actions-3cc39599.js';
+import './reducers-d6c0edb1.js';
 import 'history';
-import { h as history, d as deliveryApi, p as pickProject, r as rootSaga } from './App-fbef99b3.js';
-export { A as ReactApp } from './App-fbef99b3.js';
+import { h as history, d as deliveryApi, p as pickProject, r as rootSaga } from './App-122f28a3.js';
+export { A as ReactApp } from './App-122f28a3.js';
 import '@redux-saga/core/effects';
 import 'contensis-delivery-api';
-import './version-7fdbd2d5.js';
+import { g as getImmutableOrJS, s as selectRouteEntry, a as selectCurrentProject } from './selectors-82e71d8e.js';
+import './version-59c8f9be.js';
 import 'query-string';
-import { s as selectRouteEntry, a as selectCurrentProject } from './selectors-68799788.js';
 import 'loglevel';
-import './ToJs-6e7b247c.js';
-import './login-1f9ad133.js';
+import './ToJs-52fee252.js';
+import './login-92db44d1.js';
 import 'await-to-js';
 import 'js-cookie';
 import 'react-hot-loader';
-import './RouteLoader-281d47e1.js';
+import './RouteLoader-c2faac87.js';
 
 const servers = SERVERS;
 /* global SERVERS */
@@ -218,43 +216,6 @@ const handleResponse = (request, response, content, send = 'send') => {
   response[send](content);
 };
 
-const addStandardHeaders = (state, response, packagejson, groups) => {
-  if (state) {
-    try {
-      console.info('About to add headers');
-      const routingSurrogateKeys = state.getIn(['routing', 'surrogateKeys'], '');
-      const surrogateKeyHeader = ` ${packagejson.name}-app ${routingSurrogateKeys}`;
-      response.header('surrogate-key', surrogateKeyHeader);
-      addVarnishAuthenticationHeaders(state, response, groups);
-      response.setHeader('Surrogate-Control', `max-age=${getCacheDuration(response.statusCode)}`);
-    } catch (e) {
-      console.info('Error Adding headers', e.message);
-    }
-  }
-};
-const addVarnishAuthenticationHeaders = (state, response, groups = {}) => {
-  if (state) {
-    try {
-      const stateEntry = selectRouteEntry(state);
-      const project = selectCurrentProject(state);
-      const {
-        globalGroups,
-        allowedGroups
-      } = groups; // console.info(globalGroups, allowedGroups);
-
-      let allGroups = Array.from(globalGroups && globalGroups[project] || {});
-
-      if (stateEntry && stateEntry.getIn(['authentication', 'isLoginRequired']) && allowedGroups && allowedGroups[project]) {
-        allGroups = [...allGroups, ...allowedGroups[project]];
-      }
-
-      response.header('x-contensis-viewer-groups', allGroups.join('|'));
-    } catch (e) {
-      console.info('Error adding authentication header', e);
-    }
-  }
-};
-
 const readFileSync = path => fs.readFileSync(path, 'utf8');
 
 const loadableBundleData = ({
@@ -338,8 +299,46 @@ const getBundleTags = (loadableExtractor, scripts, staticRoutePath = 'static') =
   return startupTag;
 };
 
+const addStandardHeaders = (state, response, packagejson, groups) => {
+  if (state) {
+    try {
+      console.info('About to add headers');
+      const routingSurrogateKeys = getImmutableOrJS(state, ['routing', 'surrogateKeys'], '');
+      const surrogateKeyHeader = ` ${packagejson.name}-app ${routingSurrogateKeys}`;
+      response.header('surrogate-key', surrogateKeyHeader);
+      addVarnishAuthenticationHeaders(state, response, groups);
+      response.setHeader('Surrogate-Control', `max-age=${getCacheDuration(response.statusCode)}`);
+    } catch (e) {
+      console.info('Error Adding headers', e.message);
+    }
+  }
+};
+const addVarnishAuthenticationHeaders = (state, response, groups = {}) => {
+  if (state) {
+    try {
+      const stateEntry = selectRouteEntry(state);
+      const project = selectCurrentProject(state);
+      const {
+        globalGroups,
+        allowedGroups
+      } = groups; // console.info(globalGroups, allowedGroups);
+
+      let allGroups = Array.from(globalGroups && globalGroups[project] || {});
+
+      if (stateEntry && getImmutableOrJS(stateEntry, ['authentication', 'isLoginRequired']) && allowedGroups && allowedGroups[project]) {
+        allGroups = [...allGroups, ...allowedGroups[project]];
+      }
+
+      response.header('x-contensis-viewer-groups', allGroups.join('|'));
+    } catch (e) {
+      console.info('Error adding authentication header', e);
+    }
+  }
+};
+
 const webApp = (app, ReactApp, config) => {
   const {
+    stateType = 'immutable',
     routes,
     withReducers,
     withSagas,
@@ -359,7 +358,7 @@ const webApp = (app, ReactApp, config) => {
   scripts.startup = scripts.startup || startupScriptFilename;
   const responseHandler = typeof handleResponses === 'function' ? handleResponses : handleResponse;
   const versionInfo = JSON.parse(fs.readFileSync(`dist/${staticFolderPath}/version.json`, 'utf8'));
-  app.get('/*', (request, response) => {
+  app.get('/*', async (request, response) => {
     const {
       url
     } = request;
@@ -394,9 +393,9 @@ const webApp = (app, ReactApp, config) => {
 
     response.status(200); // Create a store (with a memory history) from our current url
 
-    const store = createStore(withReducers, fromJS({}), history({
+    const store = await createStore(withReducers, {}, history({
       initialEntries: [url]
-    })); // dispatch any global and non-saga related actions before calling our JSX
+    }), stateType); // dispatch any global and non-saga related actions before calling our JSX
 
     const versionStatusFromHostname = deliveryApi.getVersionStatusFromHostname(request.hostname);
     console.info(`Request for ${request.path} hostname: ${request.hostname} versionStatus: ${versionStatusFromHostname}`);
@@ -559,17 +558,15 @@ const start = (ReactApp, config, ServerFeatures) => {
   app.on('ready', async () => {
     // Configure DNS to make life easier
     // await ConfigureLocalDNS();
-    Loadable.preloadAll().then(() => {
-      const server = app.listen(3001, () => {
-        console.info(`HTTP server is listening @ port 3001`);
-        setTimeout(function () {
-          app.emit('app_started');
-        }, 500);
-      });
-      app.on('stop', () => {
-        server.close(function () {
-          console.info('GoodBye :(');
-        });
+    const server = app.listen(3001, () => {
+      console.info(`HTTP server is listening @ port 3001`);
+      setTimeout(function () {
+        app.emit('app_started');
+      }, 500);
+    });
+    app.on('stop', () => {
+      server.close(function () {
+        console.info('GoodBye :(');
       });
     });
   });