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

package/cjs/ToJs-87edc45d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToJs-87edc45d.js","sources":["../src/user/redux/selectors.ts","../src/user/util/matchGroups.ts","../src/util/ToJs.tsx"],"sourcesContent":["import { AppState } from '~/redux/appstate';\nimport { getJS } from '~/redux/util';\n\nconst select = (state: AppState) => getJS(state, 'user');\n\nexport const selectUserIsLoading = (state: AppState) =>\n  select(state)?.authenticationState?.loading;\n\nexport const selectUserIsAuthenticated = (state: AppState) =>\n  select(state)?.authenticationState?.authenticated;\n\nexport const selectUserAuthenticationError = (state: AppState) =>\n  select(state)?.authenticationState?.authenticationError;\n\nexport const selectUserAuthenticationErrorMessage = (state: AppState) =>\n  select(state)?.authenticationState?.authenticationErrorMessage;\n\nexport const selectUserError = (state: AppState) =>\n  select(state)?.authenticationState?.error;\n\nexport const selectUserErrorMessage = (state: AppState) =>\n  select(state)?.authenticationState?.errorMessage;\n\nexport const selectClientCredentials = (state: AppState) =>\n  select(state)?.authenticationState?.clientCredentials;\n\nexport const selectUser = (state: AppState) => state?.user;\n\nexport const selectUserIsZengentiStaff = (state: AppState) =>\n  select(state)?.isZengentiStaff;\n\nexport const selectUserGuid = (state: AppState) => select(state)?.id;\n\nexport const selectUsername = (state: AppState) => select(state)?.username;\n\nexport const selectUserEmail = (state: AppState) => select(state)?.email;\n\nexport const selectUserGroups = (state: AppState) => select(state)?.groups;\n\nexport const selectUserSecurityToken = (state: AppState) =>\n  select(state)?.authenticationState?.clientCredentials?.contensisClassicToken;\n\nexport const selectUserRegistration = (state: AppState) =>\n  select(state)?.registration || {};\n\nexport const selectUserRegistrationError = (state: AppState) =>\n  select(state)?.registration?.error || false;\n\nexport const selectUserRegistrationIsLoading = (state: AppState) =>\n  select(state)?.registration?.loading || false;\n\nexport const selectUserRegistrationIsSuccess = (state: AppState) =>\n  select(state)?.registration?.success || false;\n\nexport const selectPasswordResetRequestSending = (state: AppState) =>\n  select(state)?.passwordResetRequest?.isSending;\n\nexport const selectPasswordResetRequestSent = (state: AppState) =>\n  select(state)?.passwordResetRequest?.sent;\n\nexport const selectPasswordResetRequestError = (state: AppState) =>\n  select(state)?.passwordResetRequest?.error;\n\nexport const selectResetPasswordSending = (state: AppState) =>\n  select(state)?.resetPassword?.isSending;\n\nexport const selectResetPasswordSent = (state: AppState) =>\n  select(state)?.resetPassword?.sent;\n\nexport const selectResetPasswordError = (state: AppState) =>\n  select(state)?.resetPassword?.error;\n\nexport const selectChangePasswordSending = (state: AppState) =>\n  select(state)?.changePassword?.isSending;\n\nexport const selectChangePasswordSent = (state: AppState) =>\n  select(state)?.changePassword?.sent;\n\nexport const selectChangePasswordError = (state: AppState) =>\n  select(state)?.changePassword?.error;\n","import { Group } from 'contensis-management-api/lib/models';\nimport { RequireLogin } from '~/routing/routes';\n\nexport const matchUserGroup = (\n  userGroups: Group[] = [],\n  requiredGroups: RequireLogin = []\n) => {\n  if (\n    !Array.isArray(requiredGroups) ||\n    (Array.isArray(requiredGroups) && requiredGroups.length === 0)\n  )\n    return true;\n\n  const groupMatch = requiredGroups.some(requiredGroup => {\n    return userGroups.some(userGroup => {\n      if (requiredGroup.id === userGroup.id) {\n        return true;\n      }\n      if (requiredGroup.name === userGroup.name) {\n        return true;\n      }\n    });\n  });\n  return groupMatch;\n};\n","/* eslint-disable react/display-name */\n/* eslint-disable @typescript-eslint/naming-convention */\nimport React from 'react';\n\nexport const toJS =\n  <Props extends { [key: string]: any }>(\n    WrappedComponent: React.ComponentType<Props>\n  ): React.ComponentType<Props> =>\n  (wrappedComponentProps: Props) => {\n    const KEY = 0;\n    const VALUE = 1;\n\n    const propsJS = Object.entries(wrappedComponentProps).reduce<Props>(\n      (newProps: any, wrappedComponentProp) => {\n        const propKey = wrappedComponentProp[KEY];\n        const propValue = wrappedComponentProp[VALUE];\n        newProps[propKey] =\n          propValue && typeof propValue === 'object' && 'toJS' in propValue\n            ? propValue.toJS()\n            : propValue;\n        return newProps as Props;\n      },\n      {} as Props\n    );\n\n    return <WrappedComponent {...propsJS} />;\n  };\n"],"names":["select","state","getJS","selectUserIsLoading","authenticationState","loading","selectUserIsAuthenticated","authenticated","selectUserAuthenticationError","authenticationError","selectUserAuthenticationErrorMessage","authenticationErrorMessage","selectUserError","error","selectUserErrorMessage","errorMessage","selectClientCredentials","clientCredentials","selectUser","user","selectUserIsZengentiStaff","isZengentiStaff","selectUserGuid","id","selectUsername","username","selectUserEmail","email","selectUserGroups","groups","selectUserSecurityToken","contensisClassicToken","selectUserRegistration","registration","selectUserRegistrationError","selectUserRegistrationIsLoading","selectUserRegistrationIsSuccess","success","selectPasswordResetRequestSending","passwordResetRequest","isSending","selectPasswordResetRequestSent","sent","selectPasswordResetRequestError","selectResetPasswordSending","resetPassword","selectResetPasswordSent","selectResetPasswordError","selectChangePasswordSending","changePassword","selectChangePasswordSent","selectChangePasswordError","matchUserGroup","userGroups","requiredGroups","Array","isArray","length","groupMatch","some","requiredGroup","userGroup","name","toJS","WrappedComponent","wrappedComponentProps","KEY","VALUE","propsJS","Object","entries","reduce","newProps","wrappedComponentProp","propKey","propValue","React"],"mappings":"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"}

package/cjs/{actions-e9f69947.js → actions-12871aca.js}

@@ -1,5 +1,7 @@
 'use strict';
 
+var selectors = require('./selectors-ed26ed97.js');
+
 const ROUTING_PREFIX = '@ROUTING/';
 const GET_ENTRY = `${ROUTING_PREFIX}_GET_ENTRY`;
 const SET_ENTRY = `${ROUTING_PREFIX}_SET_ENTRY`;
@@ -30,15 +32,10 @@ var routing = /*#__PURE__*/Object.freeze({
   UPDATE_LOADING_STATE: UPDATE_LOADING_STATE
 });
 
-const action = (type, payload = {}) => ({
-  type,
-  ...payload
-});
-
-const setNotFound = notFound => action(SET_NAVIGATION_NOT_FOUND, {
+const setNotFound = notFound => selectors.action(SET_NAVIGATION_NOT_FOUND, {
   notFound
 });
-const setNavigationPath = (path, location, staticRoute, withEvents, statePath, routes) => action(SET_NAVIGATION_PATH, {
+const setNavigationPath = (path, location, staticRoute, withEvents, statePath, routes) => selectors.action(SET_NAVIGATION_PATH, {
   path,
   location,
   staticRoute,
@@ -46,19 +43,19 @@ const setNavigationPath = (path, location, staticRoute, withEvents, statePath, r
   statePath,
   routes
 });
-const setCurrentProject = (project, allowedGroups, hostname) => action(SET_TARGET_PROJECT, {
+const setCurrentProject = (project, allowedGroups, hostname) => selectors.action(SET_TARGET_PROJECT, {
   project,
   allowedGroups,
   hostname
 });
-const setRoute = (path, state) => action(SET_ROUTE, {
+const setRoute = (path, state) => selectors.action(SET_ROUTE, {
   path,
   state
 });
-const setRouteEntry = entry => action(SET_ENTRY, {
+const setRouteEntry = entry => selectors.action(SET_ENTRY, {
   entry
 });
-const setSurrogateKeys = keys => action(SET_SURROGATE_KEYS, {
+const setSurrogateKeys = keys => selectors.action(SET_SURROGATE_KEYS, {
   keys
 });
 
@@ -80,11 +77,10 @@ exports.SET_SIBLINGS = SET_SIBLINGS;
 exports.SET_SURROGATE_KEYS = SET_SURROGATE_KEYS;
 exports.SET_TARGET_PROJECT = SET_TARGET_PROJECT;
 exports.UPDATE_LOADING_STATE = UPDATE_LOADING_STATE;
-exports.action = action;
 exports.routing = routing;
 exports.routing$1 = routing$1;
 exports.setCurrentProject = setCurrentProject;
 exports.setNavigationPath = setNavigationPath;
 exports.setRoute = setRoute;
 exports.setSurrogateKeys = setSurrogateKeys;
-//# sourceMappingURL=actions-e9f69947.js.map
+//# sourceMappingURL=actions-12871aca.js.map

package/cjs/actions-12871aca.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"actions-12871aca.js","sources":["../src/routing/redux/types.ts","../src/routing/redux/actions.ts"],"sourcesContent":["const ROUTING_PREFIX = '@ROUTING/';\nexport const GET_ENTRY = `${ROUTING_PREFIX}_GET_ENTRY`;\nexport const SET_ENTRY = `${ROUTING_PREFIX}_SET_ENTRY`;\nexport const SET_NODE = `${ROUTING_PREFIX}_SET_NODE`;\nexport const SET_ANCESTORS = `${ROUTING_PREFIX}_SET_ANCESTORS`;\nexport const SET_SIBLINGS = `${ROUTING_PREFIX}_SET_SIBLINGS`;\nexport const SET_ENTRY_ID = `${ROUTING_PREFIX}_SET_ENTRY_ID`;\nexport const SET_SURROGATE_KEYS = `${ROUTING_PREFIX}_SET_SURROGATE_KEYS`;\n\nexport const SET_NAVIGATION_NOT_FOUND = `${ROUTING_PREFIX}_SET_NOT_FOUND`;\nexport const SET_NAVIGATION_PATH = `${ROUTING_PREFIX}_SET_NAVIGATION_PATH`;\n\nexport const SET_TARGET_PROJECT = `${ROUTING_PREFIX}_SET_TARGET_PROJECT`;\n\nexport const SET_ROUTE = `${ROUTING_PREFIX}_SET_ROUTE`;\n\nexport const UPDATE_LOADING_STATE = `${ROUTING_PREFIX}_UPDATE_LOADING_STATE`;\n","import { action } from '~/redux/util';\nimport {\n  SET_ENTRY,\n  SET_NAVIGATION_NOT_FOUND,\n  SET_NAVIGATION_PATH,\n  SET_TARGET_PROJECT,\n  SET_ROUTE,\n  SET_SURROGATE_KEYS,\n} from './types';\n\nexport const setNotFound = notFound =>\n  action(SET_NAVIGATION_NOT_FOUND, { notFound });\nexport const setNavigationPath = (\n  path,\n  location,\n  staticRoute,\n  withEvents,\n  statePath,\n  routes\n) =>\n  action(SET_NAVIGATION_PATH, {\n    path,\n    location,\n    staticRoute,\n    withEvents,\n    statePath,\n    routes,\n  });\nexport const setCurrentProject = (project, allowedGroups, hostname) =>\n  action(SET_TARGET_PROJECT, { project, allowedGroups, hostname });\nexport const setRoute = (path, state) => action(SET_ROUTE, { path, state });\nexport const setRouteEntry = entry => action(SET_ENTRY, { entry });\nexport const setSurrogateKeys = keys => action(SET_SURROGATE_KEYS, { keys });\n"],"names":["ROUTING_PREFIX","GET_ENTRY","SET_ENTRY","SET_NODE","SET_ANCESTORS","SET_SIBLINGS","SET_ENTRY_ID","SET_SURROGATE_KEYS","SET_NAVIGATION_NOT_FOUND","SET_NAVIGATION_PATH","SET_TARGET_PROJECT","SET_ROUTE","UPDATE_LOADING_STATE","setNotFound","notFound","action","setNavigationPath","path","location","staticRoute","withEvents","statePath","routes","setCurrentProject","project","allowedGroups","hostname","setRoute","state","setRouteEntry","entry","setSurrogateKeys","keys"],"mappings":";;;;AAAA,MAAMA,cAAc,GAAG,WAAvB;AACO,MAAMC,SAAS,GAAI,GAAED,cAAe,YAApC;MACME,SAAS,GAAI,GAAEF,cAAe;AACpC,MAAMG,QAAQ,GAAI,GAAEH,cAAe,WAAnC;MACMI,aAAa,GAAI,GAAEJ,cAAe;MAClCK,YAAY,GAAI,GAAEL,cAAe;AACvC,MAAMM,YAAY,GAAI,GAAEN,cAAe,eAAvC;MACMO,kBAAkB,GAAI,GAAEP,cAAe;AAE7C,MAAMQ,wBAAwB,GAAI,GAAER,cAAe,gBAAnD;MACMS,mBAAmB,GAAI,GAAET,cAAe;MAExCU,kBAAkB,GAAI,GAAEV,cAAe;MAEvCW,SAAS,GAAI,GAAEX,cAAe;MAE9BY,oBAAoB,GAAI,GAAEZ,cAAe;;;;;;;;;;;;;;;;;;ACN/C,MAAMa,WAAW,GAAGC,QAAQ,IACjCC,gBAAM,CAACP,wBAAD,EAA2B;AAAEM,EAAAA;AAAF,CAA3B,CADD;MAEME,iBAAiB,GAAG,CAC/BC,IAD+B,EAE/BC,QAF+B,EAG/BC,WAH+B,EAI/BC,UAJ+B,EAK/BC,SAL+B,EAM/BC,MAN+B,KAQ/BP,gBAAM,CAACN,mBAAD,EAAsB;AAC1BQ,EAAAA,IAD0B;AAE1BC,EAAAA,QAF0B;AAG1BC,EAAAA,WAH0B;AAI1BC,EAAAA,UAJ0B;AAK1BC,EAAAA,SAL0B;AAM1BC,EAAAA;AAN0B,CAAtB;MAQKC,iBAAiB,GAAG,CAACC,OAAD,EAAUC,aAAV,EAAyBC,QAAzB,KAC/BX,gBAAM,CAACL,kBAAD,EAAqB;AAAEc,EAAAA,OAAF;AAAWC,EAAAA,aAAX;AAA0BC,EAAAA;AAA1B,CAArB;MACKC,QAAQ,GAAG,CAACV,IAAD,EAAOW,KAAP,KAAiBb,gBAAM,CAACJ,SAAD,EAAY;AAAEM,EAAAA,IAAF;AAAQW,EAAAA;AAAR,CAAZ;AACxC,MAAMC,aAAa,GAAGC,KAAK,IAAIf,gBAAM,CAACb,SAAD,EAAY;AAAE4B,EAAAA;AAAF,CAAZ,CAArC;MACMC,gBAAgB,GAAGC,IAAI,IAAIjB,gBAAM,CAACR,kBAAD,EAAqB;AAAEyB,EAAAA;AAAF,CAArB;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/cjs/client.js

@@ -8,29 +8,28 @@ var reactRouterDom = require('react-router-dom');
 var reactRedux = require('react-redux');
 require('react-router-config');
 require('jsonpath-mapper');
-require('immutable');
 require('redux');
-require('redux-immutable');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
-var version = require('./version-3a808c12.js');
-var actions = require('./actions-e9f69947.js');
-var reducers = require('./reducers-cb531715.js');
+require('immer');
+var version = require('./version-f061e409.js');
+var actions = require('./actions-12871aca.js');
+require('./reducers-fde41d6b.js');
 require('history');
-var App = require('./App-fbd91490.js');
+var App = require('./App-581b6653.js');
 require('@redux-saga/core/effects');
 require('contensis-delivery-api');
-require('./version-2193b4a2.js');
+require('./selectors-ed26ed97.js');
+require('./version-0c190929.js');
 var queryString = require('query-string');
-require('./selectors-1295124a.js');
 require('loglevel');
-require('./ToJs-d72e5b10.js');
-require('./login-4f274c6a.js');
+require('./ToJs-87edc45d.js');
+require('./login-81d7f9ef.js');
 require('await-to-js');
 require('js-cookie');
 var reactHotLoader = require('react-hot-loader');
-require('./RouteLoader-f99cd734.js');
+require('./RouteLoader-282c03ab.js');
 var reactDom = require('react-dom');
 var component = require('@loadable/component');
 
@@ -38,34 +37,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-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 = reducers.fromJSOrdered(js);
-
-  if (immutableObj && !!immutableObj.get('immer')) {
-    immutableObj.set('immer', immutableObj.get('immer').toJS());
-  }
-
-  return immutableObj;
-};
-
 class ClientApp {
   constructor(ReactApp, config) {
     const documentRoot = document.getElementById('root');
     const {
+      stateType = 'immutable',
       routes,
       withReducers,
       withSagas,
@@ -97,22 +73,33 @@ class ClientApp {
       });else reactDom.render(Component, documentRoot);
     };
 
-    let store = null;
+    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));
+        });
+      }
+    };
+
     const qs = queryString.parse(window.location.search);
     const versionStatusFromHostname = App.deliveryApi.getClientSideVersionStatus();
 
     if (window.isDynamic || window.REDUX_DATA || process.env.NODE_ENV !== 'production') {
-      store = version.createStore(withReducers, fromJSLeaveImmer(window.REDUX_DATA), App.browserHistory);
-      store.dispatch(version.setVersionStatus(qs.versionStatus || versionStatusFromHostname));
-      /* eslint-disable no-console */
+      version.createStore(withReducers, window.REDUX_DATA, App.browserHistory, stateType).then(store => {
+        store.dispatch(version.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(App.rootSaga(withSagas));
-      store.dispatch(actions.setCurrentProject(App.pickProject(window.location.hostname, qs), [], window.location.hostname));
-      delete window.REDUX_DATA;
-      HMRRenderer(GetClientJSX(store));
+        store.runSaga(App.rootSaga(withSagas));
+        store.dispatch(actions.setCurrentProject(App.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 */
@@ -121,22 +108,16 @@ class ClientApp {
 
         /* eslint-enable no-console */
         const ssRedux = JSON.parse(data);
-        store = version.createStore(withReducers, fromJSLeaveImmer(ssRedux), App.browserHistory); // store.dispatch(setVersionStatus(versionStatusFromHostname));
-
-        store.runSaga(App.rootSaga(withSagas));
-        store.dispatch(actions.setCurrentProject(App.pickProject(window.location.hostname, queryString.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));
+        version.createStore(withReducers, ssRedux, App.browserHistory, stateType).then(store => {
+          // store.dispatch(setVersionStatus(versionStatusFromHostname));
+          store.runSaga(App.rootSaga(withSagas));
+          store.dispatch(actions.setCurrentProject(App.pickProject(window.location.hostname, queryString.parse(window.location.search)), [], window.location.hostname)); // if (typeof window != 'undefined') {
+          //   store.dispatch(checkUserLoggedIn());
+          // }
+
+          HMRRenderer(GetClientJSX(store));
+          hmr(store);
+        });
       });
     }
   }

package/cjs/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 { 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 fromJSLeaveImmer from '~/util/fromJSLeaveImmer';\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 { 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      if (isProduction)\n        loadableReady(\n          () => {\n            hydrate(Component, documentRoot);\n          },\n          { namespace: 'modern' }\n        );\n      else render(Component, documentRoot);\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","React","AppContainer","ReduxProvider","Router","history","isProduction","process","env","NODE_ENV","HMRRenderer","Component","loadableReady","hydrate","namespace","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","then","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","React","AppContainer","ReduxProvider","Router","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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,MAAMA,SAAN,CAAgB;AACdC,EAAAA,WAAW,CAACC,QAAD,EAA+CC,MAA/C,EAAkE;AAC3E,UAAMC,YAAY,GAAGC,QAAQ,CAACC,cAAT,CAAwB,MAAxB,CAArB;AAEA,UAAM;AACJC,MAAAA,SAAS,GAAG,WADR;AAEJC,MAAAA,MAFI;AAGJC,MAAAA,YAHI;AAIJC,MAAAA,SAJI;AAKJC,MAAAA;AALI,QAMFR,MANJ;;AAQA,UAAMS,YAAY,GAAGC,KAAK,IAAI;AAC5B,YAAMC,SAAS,gBACbC,wCAACC,2BAAD,qBACED,wCAACE,mBAAD;AAAe,QAAA,KAAK,EAAEJ;AAAtB,sBACEE,wCAACG,qBAAD;AAAQ,QAAA,OAAO,EAAEC;AAAjB,sBACEJ,wCAAC,QAAD;AAAU,QAAA,MAAM,EAAEP,MAAlB;AAA0B,QAAA,UAAU,EAAEG;AAAtC,QADF,CADF,CADF,CADF;AASA,aAAOG,SAAP;AACD,KAXD;;AAaA,UAAMM,YAAY,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAA3B,CAArB;AAEA;AACJ;AACA;;AACI,UAAMC,WAAW,GAAGC,SAAS,IAAI;AAC/B,UAAIL,YAAJ,EACEM,uBAAa,CACX,MAAM;AACJC,QAAAA,gBAAO,CAACF,SAAD,EAAYrB,YAAZ,CAAP;AACD,OAHU,EAIX;AAAEwB,QAAAA,SAAS,EAAE;AAAb,OAJW,CAAb,CADF,KAOKC,eAAM,CAACJ,SAAD,EAAYrB,YAAZ,CAAN;AACN,KATD;;AAWA,UAAM0B,GAAG,GAAGjB,KAAK,IAAI;AACnB;AACA,UAAIkB,MAAM,CAACC,GAAX,EAAgB;AACdD,QAAAA,MAAM,CAACC,GAAP,CAAWC,MAAX,CAAkB/B,QAAlB,EAAiD,MAAM;AACrD;AACAsB,UAAAA,WAAW,CAACZ,YAAY,CAACC,KAAD,CAAb,CAAX;AACD,SAHD;AAID;AACF,KARD;;AAUA,UAAMqB,EAAE,GAAGC,iBAAA,CAAkBC,MAAM,CAACC,QAAP,CAAgBC,MAAlC,CAAX;AACA,UAAMC,yBAAyB,GAAGC,eAAW,CAACC,0BAAZ,EAAlC;;AAEA,QACEL,MAAM,CAACM,SAAP,IACAN,MAAM,CAACO,UADP,IAEAtB,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAH3B,EAIE;AACAqB,MAAAA,mBAAW,CAACnC,YAAD,EAAe2B,MAAM,CAACO,UAAtB,EAAkCxB,kBAAlC,EAA2CZ,SAA3C,CAAX,CAAiEsC,IAAjE,CACEhC,KAAK,IAAI;AACPA,QAAAA,KAAK,CAACiC,QAAN,CACEC,wBAAgB,CAACb,EAAE,CAACc,aAAH,IAAoBT,yBAArB,CADlB;AAIA;;AACAU,QAAAA,OAAO,CAACC,GAAR,CAAY,6BAAZ;AACA;;AACArC,QAAAA,KAAK,CAACsC,OAAN,CAAcC,YAAQ,CAAC1C,SAAD,CAAtB;AACAG,QAAAA,KAAK,CAACiC,QAAN,CACEO,yBAAiB,CACfC,eAAW,CAAClB,MAAM,CAACC,QAAP,CAAgBkB,QAAjB,EAA2BrB,EAA3B,CADI,EAEf,EAFe,EAGfE,MAAM,CAACC,QAAP,CAAgBkB,QAHD,CADnB;AAQA,eAAOnB,MAAM,CAACO,UAAd;AACAnB,QAAAA,WAAW,CAACZ,YAAY,CAACC,KAAD,CAAb,CAAX;AAEAiB,QAAAA,GAAG,CAACjB,KAAD,CAAH;AACD,OAtBH;AAwBD,KA7BD,MA6BO;AACL2C,MAAAA,KAAK,CAAE,GAAEpB,MAAM,CAACC,QAAP,CAAgBoB,QAAS,aAA7B,CAAL,CACGZ,IADH,CACQa,QAAQ,IAAIA,QAAQ,CAACC,IAAT,EADpB,EAEGd,IAFH,CAEQe,IAAI,IAAI;AACZ;AACA;AACA;;AACA;AACA,cAAMC,OAAO,GAAGC,IAAI,CAACC,KAAL,CAAWH,IAAX,CAAhB;AACAhB,QAAAA,mBAAW,CAACnC,YAAD,EAAeoD,OAAf,EAAwB1C,kBAAxB,EAAiCZ,SAAjC,CAAX,CAAuDsC,IAAvD,CAA4DhC,KAAK,IAAI;AACnE;AAEAA,UAAAA,KAAK,CAACsC,OAAN,CAAcC,YAAQ,CAAC1C,SAAD,CAAtB;AACAG,UAAAA,KAAK,CAACiC,QAAN,CACEO,yBAAiB,CACfC,eAAW,CACTlB,MAAM,CAACC,QAAP,CAAgBkB,QADP,EAETpB,iBAAA,CAAkBC,MAAM,CAACC,QAAP,CAAgBC,MAAlC,CAFS,CADI,EAKf,EALe,EAMfF,MAAM,CAACC,QAAP,CAAgBkB,QAND,CADnB,EAJmE;AAenE;AACA;;AACA/B,UAAAA,WAAW,CAACZ,YAAY,CAACC,KAAD,CAAb,CAAX;AAEAiB,UAAAA,GAAG,CAACjB,KAAD,CAAH;AACD,SApBD;AAqBD,OA7BH;AA8BD;AACF;;AAnHa;;;;;"}

package/cjs/contensis-react-base.js

@@ -13,35 +13,34 @@ var server$1 = require('react-dom/server');
 var reactRouterDom = require('react-router-dom');
 var reactRedux = require('react-redux');
 var reactRouterConfig = require('react-router-config');
-var Helmet = require('react-helmet');
+var reactHelmet = require('react-helmet');
 var styled = require('styled-components');
 var serialize = require('serialize-javascript');
 var minifyCssString = require('minify-css-string');
 var mapJson = require('jsonpath-mapper');
 var server = require('@loadable/server');
-var immutable = require('immutable');
 require('redux');
-require('redux-immutable');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
-var version = require('./version-3a808c12.js');
-var actions = require('./actions-e9f69947.js');
-require('./reducers-cb531715.js');
+require('immer');
+var version = require('./version-f061e409.js');
+var actions = require('./actions-12871aca.js');
+require('./reducers-fde41d6b.js');
 require('history');
-var App = require('./App-fbd91490.js');
+var App = require('./App-581b6653.js');
 require('@redux-saga/core/effects');
 require('contensis-delivery-api');
-require('./version-2193b4a2.js');
+var selectors = require('./selectors-ed26ed97.js');
+require('./version-0c190929.js');
 require('query-string');
-var selectors = require('./selectors-1295124a.js');
 require('loglevel');
-require('./ToJs-d72e5b10.js');
-require('./login-4f274c6a.js');
+require('./ToJs-87edc45d.js');
+require('./login-81d7f9ef.js');
 require('await-to-js');
 require('js-cookie');
 require('react-hot-loader');
-require('./RouteLoader-f99cd734.js');
+require('./RouteLoader-282c03ab.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,7 +49,6 @@ var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Helmet__default = /*#__PURE__*/_interopDefaultLegacy(Helmet);
 var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var minifyCssString__default = /*#__PURE__*/_interopDefaultLegacy(minifyCssString);
 var mapJson__default = /*#__PURE__*/_interopDefaultLegacy(mapJson);
@@ -232,43 +230,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 = selectors.selectRouteEntry(state);
-      const project = selectors.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__default['default'].readFileSync(path, 'utf8');
 
 const loadableBundleData = ({
@@ -352,8 +313,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 = selectors.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 = selectors.selectRouteEntry(state);
+      const project = selectors.selectCurrentProject(state);
+      const {
+        globalGroups,
+        allowedGroups
+      } = groups; // console.info(globalGroups, allowedGroups);
+
+      let allGroups = Array.from(globalGroups && globalGroups[project] || {});
+
+      if (stateEntry && selectors.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,
@@ -373,7 +372,7 @@ const webApp = (app, ReactApp, config) => {
   scripts.startup = scripts.startup || startupScriptFilename;
   const responseHandler = typeof handleResponses === 'function' ? handleResponses : handleResponse;
   const versionInfo = JSON.parse(fs__default['default'].readFileSync(`dist/${staticFolderPath}/version.json`, 'utf8'));
-  app.get('/*', (request, response) => {
+  app.get('/*', async (request, response) => {
     const {
       url
     } = request;
@@ -408,9 +407,9 @@ const webApp = (app, ReactApp, config) => {
 
     response.status(200); // Create a store (with a memory history) from our current url
 
-    const store = version.createStore(withReducers, immutable.fromJS({}), App.history({
+    const store = await version.createStore(withReducers, {}, App.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 = App.deliveryApi.getVersionStatusFromHostname(request.hostname);
     console.info(`Request for ${request.path} hostname: ${request.hostname} versionStatus: ${versionStatusFromHostname}`);
@@ -456,8 +455,8 @@ const webApp = (app, ReactApp, config) => {
       store.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
         const sheet = new styled.ServerStyleSheet();
         const html = server$1.renderToString(sheet.collectStyles(jsx));
-        const helmet = Helmet__default['default'].renderStatic();
-        Helmet__default['default'].rewind();
+        const helmet = reactHelmet.Helmet.renderStatic();
+        reactHelmet.Helmet.rewind();
         const htmlAttributes = helmet.htmlAttributes.toString();
         let title = helmet.title.toString();
         const metadata = helmet.meta.toString();