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

package/cjs/ToJs-5da8a85e.js

@@ -0,0 +1,124 @@
+'use strict';
+
+var selectors$1 = require('./selectors-2c1b1183.js');
+var React = require('react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+const selectUserIsLoading = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'loading']);
+const selectUserIsAuthenticated = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'authenticated']);
+const selectUserAuthenticationError = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'authenticationError']);
+const selectUserAuthenticationErrorMessage = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'authenticationErrorMessage']);
+const selectUserError = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'error']);
+const selectUserErrorMessage = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'errorMessage']);
+const selectClientCredentials = (state, returnType) => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'clientCredentials'], {}, returnType);
+const selectUser = (state, returnType) => selectors$1.getImmutableOrJS(state, 'user', {}, returnType);
+const selectUserIsZengentiStaff = state => selectors$1.getImmutableOrJS(state, ['user', 'isZengentiStaff']);
+const selectUserGuid = state => selectors$1.getImmutableOrJS(state, ['user', 'id']);
+const selectUsername = state => selectors$1.getImmutableOrJS(state, ['user', 'username']);
+const selectUserEmail = state => selectors$1.getImmutableOrJS(state, ['user', 'email']);
+const selectUserGroups = (state, returnType) => selectors$1.getImmutableOrJS(state, ['user', 'groups'], [], returnType);
+const selectUserSecurityToken = state => selectors$1.getImmutableOrJS(state, ['user', 'authenticationState', 'clientCredentials', 'contensisClassicToken']);
+const selectUserRegistration = (state, returnType) => selectors$1.getImmutableOrJS(state, ['user', 'registration'], {}, returnType);
+const selectUserRegistrationError = state => selectors$1.getImmutableOrJS(state, ['user', 'registration', 'error'], false);
+const selectUserRegistrationIsLoading = state => selectors$1.getImmutableOrJS(state, ['user', 'registration', 'loading'], false);
+const selectUserRegistrationIsSuccess = state => selectors$1.getImmutableOrJS(state, ['user', 'registration', 'success'], false);
+const selectPasswordResetRequestSending = state => selectors$1.getImmutableOrJS(state, ['user', 'passwordResetRequest', 'isSending']);
+const selectPasswordResetRequestSent = state => selectors$1.getImmutableOrJS(state, ['user', 'passwordResetRequest', 'sent']);
+const selectPasswordResetRequestError = state => selectors$1.getImmutableOrJS(state, ['user', 'passwordResetRequest', 'error']);
+const selectResetPasswordSending = state => selectors$1.getImmutableOrJS(state, ['user', 'resetPassword', 'isSending']);
+const selectResetPasswordSent = state => selectors$1.getImmutableOrJS(state, ['user', 'resetPassword', 'sent']);
+const selectResetPasswordError = state => selectors$1.getImmutableOrJS(state, ['user', 'resetPassword', 'error']);
+const selectChangePasswordSending = state => selectors$1.getImmutableOrJS(state, ['user', 'changePassword', 'isSending']);
+const selectChangePasswordSent = state => selectors$1.getImmutableOrJS(state, ['user', 'changePassword', 'sent']);
+const selectChangePasswordError = state => selectors$1.getImmutableOrJS(state, ['user', 'changePassword', 'error']);
+
+var selectors = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  selectUserIsLoading: selectUserIsLoading,
+  selectUserIsAuthenticated: selectUserIsAuthenticated,
+  selectUserAuthenticationError: selectUserAuthenticationError,
+  selectUserAuthenticationErrorMessage: selectUserAuthenticationErrorMessage,
+  selectUserError: selectUserError,
+  selectUserErrorMessage: selectUserErrorMessage,
+  selectClientCredentials: selectClientCredentials,
+  selectUser: selectUser,
+  selectUserIsZengentiStaff: selectUserIsZengentiStaff,
+  selectUserGuid: selectUserGuid,
+  selectUsername: selectUsername,
+  selectUserEmail: selectUserEmail,
+  selectUserGroups: selectUserGroups,
+  selectUserSecurityToken: selectUserSecurityToken,
+  selectUserRegistration: selectUserRegistration,
+  selectUserRegistrationError: selectUserRegistrationError,
+  selectUserRegistrationIsLoading: selectUserRegistrationIsLoading,
+  selectUserRegistrationIsSuccess: selectUserRegistrationIsSuccess,
+  selectPasswordResetRequestSending: selectPasswordResetRequestSending,
+  selectPasswordResetRequestSent: selectPasswordResetRequestSent,
+  selectPasswordResetRequestError: selectPasswordResetRequestError,
+  selectResetPasswordSending: selectResetPasswordSending,
+  selectResetPasswordSent: selectResetPasswordSent,
+  selectResetPasswordError: selectResetPasswordError,
+  selectChangePasswordSending: selectChangePasswordSending,
+  selectChangePasswordSent: selectChangePasswordSent,
+  selectChangePasswordError: selectChangePasswordError
+});
+
+const matchUserGroup = (userGroups = [], requiredGroups = []) => {
+  if (!Array.isArray(requiredGroups) || Array.isArray(requiredGroups) && requiredGroups.length === 0) return true;
+  const groupMatch = requiredGroups.some(requiredGroup => {
+    return userGroups.some(userGroup => {
+      if (requiredGroup.id === userGroup.id) {
+        return true;
+      }
+
+      if (requiredGroup.name === userGroup.name) {
+        return true;
+      }
+    });
+  });
+  return groupMatch;
+};
+
+/* eslint-disable react/display-name */
+const toJS = WrappedComponent => wrappedComponentProps => {
+  const KEY = 0;
+  const VALUE = 1;
+  const propsJS = Object.entries(wrappedComponentProps).reduce((newProps, wrappedComponentProp) => {
+    const propKey = wrappedComponentProp[KEY];
+    const propValue = wrappedComponentProp[VALUE];
+    newProps[propKey] = propValue && typeof propValue === 'object' && 'toJS' in propValue ? propValue.toJS() : propValue;
+    return newProps;
+  }, {});
+  return /*#__PURE__*/React__default["default"].createElement(WrappedComponent, propsJS);
+};
+
+exports.matchUserGroup = matchUserGroup;
+exports.selectChangePasswordError = selectChangePasswordError;
+exports.selectChangePasswordSending = selectChangePasswordSending;
+exports.selectChangePasswordSent = selectChangePasswordSent;
+exports.selectClientCredentials = selectClientCredentials;
+exports.selectPasswordResetRequestError = selectPasswordResetRequestError;
+exports.selectPasswordResetRequestSending = selectPasswordResetRequestSending;
+exports.selectPasswordResetRequestSent = selectPasswordResetRequestSent;
+exports.selectResetPasswordError = selectResetPasswordError;
+exports.selectResetPasswordSending = selectResetPasswordSending;
+exports.selectResetPasswordSent = selectResetPasswordSent;
+exports.selectUser = selectUser;
+exports.selectUserAuthenticationError = selectUserAuthenticationError;
+exports.selectUserAuthenticationErrorMessage = selectUserAuthenticationErrorMessage;
+exports.selectUserError = selectUserError;
+exports.selectUserErrorMessage = selectUserErrorMessage;
+exports.selectUserGroups = selectUserGroups;
+exports.selectUserGuid = selectUserGuid;
+exports.selectUserIsAuthenticated = selectUserIsAuthenticated;
+exports.selectUserIsLoading = selectUserIsLoading;
+exports.selectUserRegistration = selectUserRegistration;
+exports.selectUserRegistrationError = selectUserRegistrationError;
+exports.selectUserRegistrationIsLoading = selectUserRegistrationIsLoading;
+exports.selectUserRegistrationIsSuccess = selectUserRegistrationIsSuccess;
+exports.selectors = selectors;
+exports.toJS = toJS;
+//# sourceMappingURL=ToJs-5da8a85e.js.map

package/cjs/ToJs-5da8a85e.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToJs-5da8a85e.js","sources":["../src/user/redux/selectors.ts","../src/user/util/matchGroups.ts","../src/util/ToJs.tsx"],"sourcesContent":["import { StateType } from '~/config';\nimport { AppState } from '~/redux/appstate';\nimport { getImmutableOrJS as getIn } from '~/redux/util';\n\nexport const selectUserIsLoading = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'loading']);\n\nexport const selectUserIsAuthenticated = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'authenticated']);\n\nexport const selectUserAuthenticationError = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'authenticationError']);\n\nexport const selectUserAuthenticationErrorMessage = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'authenticationErrorMessage']);\n\nexport const selectUserError = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'error']);\n\nexport const selectUserErrorMessage = (state: AppState) =>\n  getIn(state, ['user', 'authenticationState', 'errorMessage']);\n\nexport const selectClientCredentials = (\n  state: AppState,\n  returnType?: StateType\n) =>\n  getIn(\n    state,\n    ['user', 'authenticationState', 'clientCredentials'],\n    {},\n    returnType\n  );\n\nexport const selectUser = (state: AppState, returnType?: StateType) =>\n  getIn(state, 'user', {}, returnType);\n\nexport const selectUserIsZengentiStaff = (state: AppState) =>\n  getIn(state, ['user', 'isZengentiStaff']);\n\nexport const selectUserGuid = (state: AppState) => getIn(state, ['user', 'id']);\n\nexport const selectUsername = (state: AppState) =>\n  getIn(state, ['user', 'username']);\n\nexport const selectUserEmail = (state: AppState) =>\n  getIn(state, ['user', 'email']);\n\nexport const selectUserGroups = (state: AppState, returnType?: StateType) =>\n  getIn(state, ['user', 'groups'], [], returnType);\n\nexport const selectUserSecurityToken = (state: AppState) =>\n  getIn(state, [\n    'user',\n    'authenticationState',\n    'clientCredentials',\n    'contensisClassicToken',\n  ]);\n\nexport const selectUserRegistration = (\n  state: AppState,\n  returnType?: StateType\n) => getIn(state, ['user', 'registration'], {}, returnType);\n\nexport const selectUserRegistrationError = (state: AppState) =>\n  getIn(state, ['user', 'registration', 'error'], false);\n\nexport const selectUserRegistrationIsLoading = (state: AppState) =>\n  getIn(state, ['user', 'registration', 'loading'], false);\n\nexport const selectUserRegistrationIsSuccess = (state: AppState) =>\n  getIn(state, ['user', 'registration', 'success'], false);\n\nexport const selectPasswordResetRequestSending = (state: AppState) =>\n  getIn(state, ['user', 'passwordResetRequest', 'isSending']);\n\nexport const selectPasswordResetRequestSent = (state: AppState) =>\n  getIn(state, ['user', 'passwordResetRequest', 'sent']);\n\nexport const selectPasswordResetRequestError = (state: AppState) =>\n  getIn(state, ['user', 'passwordResetRequest', 'error']);\n\nexport const selectResetPasswordSending = (state: AppState) =>\n  getIn(state, ['user', 'resetPassword', 'isSending']);\n\nexport const selectResetPasswordSent = (state: AppState) =>\n  getIn(state, ['user', 'resetPassword', 'sent']);\n\nexport const selectResetPasswordError = (state: AppState) =>\n  getIn(state, ['user', 'resetPassword', 'error']);\n\nexport const selectChangePasswordSending = (state: AppState) =>\n  getIn(state, ['user', 'changePassword', 'isSending']);\n\nexport const selectChangePasswordSent = (state: AppState) =>\n  getIn(state, ['user', 'changePassword', 'sent']);\n\nexport const selectChangePasswordError = (state: AppState) =>\n  getIn(state, ['user', '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":["selectUserIsLoading","state","getIn","selectUserIsAuthenticated","selectUserAuthenticationError","selectUserAuthenticationErrorMessage","selectUserError","selectUserErrorMessage","selectClientCredentials","returnType","selectUser","selectUserIsZengentiStaff","selectUserGuid","selectUsername","selectUserEmail","selectUserGroups","selectUserSecurityToken","selectUserRegistration","selectUserRegistrationError","selectUserRegistrationIsLoading","selectUserRegistrationIsSuccess","selectPasswordResetRequestSending","selectPasswordResetRequestSent","selectPasswordResetRequestError","selectResetPasswordSending","selectResetPasswordSent","selectResetPasswordError","selectChangePasswordSending","selectChangePasswordSent","selectChangePasswordError","matchUserGroup","userGroups","requiredGroups","Array","isArray","length","groupMatch","some","requiredGroup","userGroup","id","name","toJS","WrappedComponent","wrappedComponentProps","KEY","VALUE","propsJS","Object","entries","reduce","newProps","wrappedComponentProp","propKey","propValue","React"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var selectors = require('./selectors-ed26ed97.js');
+var selectors = require('./selectors-2c1b1183.js');
 
 const ROUTING_PREFIX = '@ROUTING/';
 const GET_ENTRY = `${ROUTING_PREFIX}_GET_ENTRY`;
@@ -16,7 +16,7 @@ const SET_TARGET_PROJECT = `${ROUTING_PREFIX}_SET_TARGET_PROJECT`;
 const SET_ROUTE = `${ROUTING_PREFIX}_SET_ROUTE`;
 const UPDATE_LOADING_STATE = `${ROUTING_PREFIX}_UPDATE_LOADING_STATE`;
 
-var routing = /*#__PURE__*/Object.freeze({
+var routing$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   GET_ENTRY: GET_ENTRY,
   SET_ENTRY: SET_ENTRY,
@@ -59,7 +59,7 @@ const setSurrogateKeys = keys => selectors.action(SET_SURROGATE_KEYS, {
   keys
 });
 
-var routing$1 = /*#__PURE__*/Object.freeze({
+var routing = /*#__PURE__*/Object.freeze({
   __proto__: null,
   setNotFound: setNotFound,
   setNavigationPath: setNavigationPath,
@@ -77,10 +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.routing = routing;
-exports.routing$1 = routing$1;
+exports.routing = routing$1;
+exports.routing$1 = routing;
 exports.setCurrentProject = setCurrentProject;
 exports.setNavigationPath = setNavigationPath;
 exports.setRoute = setRoute;
 exports.setSurrogateKeys = setSurrogateKeys;
-//# sourceMappingURL=actions-12871aca.js.map
+//# sourceMappingURL=actions-43f4daa4.js.map

package/cjs/{actions-12871aca.js.map → actions-43f4daa4.js.map}

@@ -1 +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;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"actions-43f4daa4.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

@@ -4,38 +4,59 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('isomorphic-fetch');
 var React = require('react');
-var reactRouterDom = require('react-router-dom');
+var reactDom = require('react-dom');
+var reactHotLoader = require('react-hot-loader');
 var reactRedux = require('react-redux');
-require('react-router-config');
+var reactRouterDom = require('react-router-dom');
+var component = require('@loadable/component');
+var queryString = require('query-string');
+var version = require('./version-6f8f4530.js');
+var App = require('./App-7ecf6d63.js');
+var actions = require('./actions-43f4daa4.js');
+require('./selectors-2c1b1183.js');
 require('jsonpath-mapper');
+require('@redux-saga/core/effects');
 require('redux');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
 require('immer');
-var version = require('./version-f061e409.js');
-var actions = require('./actions-12871aca.js');
-require('./reducers-fde41d6b.js');
+require('deepmerge');
+require('./reducers-60dafd94.js');
 require('history');
-var App = require('./App-581b6653.js');
-require('@redux-saga/core/effects');
 require('contensis-delivery-api');
-require('./selectors-ed26ed97.js');
-require('./version-0c190929.js');
-var queryString = require('query-string');
+require('./version-dcfdafd9.js');
 require('loglevel');
-require('./ToJs-87edc45d.js');
-require('./login-81d7f9ef.js');
+require('./login-5e3972d3.js');
+require('./ToJs-5da8a85e.js');
 require('await-to-js');
 require('js-cookie');
-var reactHotLoader = require('react-hot-loader');
-require('./RouteLoader-282c03ab.js');
-var reactDom = require('react-dom');
-var component = require('@loadable/component');
+require('./RouteLoader-fb056e9e.js');
+require('react-router-config');
+require('reselect');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var queryString__namespace = /*#__PURE__*/_interopNamespace(queryString);
 
 class ClientApp {
   constructor(ReactApp, config) {
@@ -49,11 +70,11 @@ class ClientApp {
     } = config;
 
     const GetClientJSX = store => {
-      const ClientJsx = /*#__PURE__*/React__default['default'].createElement(reactHotLoader.AppContainer, null, /*#__PURE__*/React__default['default'].createElement(reactRedux.Provider, {
+      const ClientJsx = /*#__PURE__*/React__default["default"].createElement(reactHotLoader.AppContainer, null, /*#__PURE__*/React__default["default"].createElement(reactRedux.Provider, {
         store: store
-      }, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Router, {
+      }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Router, {
         history: App.browserHistory
-      }, /*#__PURE__*/React__default['default'].createElement(ReactApp, {
+      }, /*#__PURE__*/React__default["default"].createElement(ReactApp, {
         routes: routes,
         withEvents: withEvents
       }))));
@@ -83,7 +104,7 @@ class ClientApp {
       }
     };
 
-    const qs = queryString.parse(window.location.search);
+    const qs = queryString__namespace.parse(window.location.search);
     const versionStatusFromHostname = App.deliveryApi.getClientSideVersionStatus();
 
     if (window.isDynamic || window.REDUX_DATA || process.env.NODE_ENV !== 'production') {
@@ -111,7 +132,7 @@ class ClientApp {
         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(actions.setCurrentProject(App.pickProject(window.location.hostname, queryString__namespace.parse(window.location.search)), [], window.location.hostname)); // if (typeof window != 'undefined') {
           //   store.dispatch(checkUserLoggedIn());
           // }
 
@@ -125,5 +146,5 @@ class ClientApp {
 }
 
 exports.ReactApp = App.AppRoot;
-exports.default = ClientApp;
+exports["default"] = ClientApp;
 //# sourceMappingURL=client.js.map

package/cjs/client.js.map

@@ -1 +1 @@
-{"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":"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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","parse","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"],"mappings":"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"}

package/cjs/contensis-react-base.js

@@ -19,28 +19,30 @@ var serialize = require('serialize-javascript');
 var minifyCssString = require('minify-css-string');
 var mapJson = require('jsonpath-mapper');
 var server = require('@loadable/server');
+var version = require('./version-6f8f4530.js');
+var App = require('./App-7ecf6d63.js');
+var actions = require('./actions-43f4daa4.js');
+var selectors = require('./selectors-2c1b1183.js');
+require('@redux-saga/core/effects');
 require('redux');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
 require('immer');
-var version = require('./version-f061e409.js');
-var actions = require('./actions-12871aca.js');
-require('./reducers-fde41d6b.js');
+require('deepmerge');
+require('./reducers-60dafd94.js');
 require('history');
-var App = require('./App-581b6653.js');
-require('@redux-saga/core/effects');
 require('contensis-delivery-api');
-var selectors = require('./selectors-ed26ed97.js');
-require('./version-0c190929.js');
-require('query-string');
+require('./version-dcfdafd9.js');
 require('loglevel');
-require('./ToJs-87edc45d.js');
-require('./login-81d7f9ef.js');
+require('./login-5e3972d3.js');
+require('./ToJs-5da8a85e.js');
 require('await-to-js');
 require('js-cookie');
 require('react-hot-loader');
-require('./RouteLoader-282c03ab.js');
+require('query-string');
+require('./RouteLoader-fb056e9e.js');
+require('reselect');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -53,7 +55,7 @@ var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var minifyCssString__default = /*#__PURE__*/_interopDefaultLegacy(minifyCssString);
 var mapJson__default = /*#__PURE__*/_interopDefaultLegacy(mapJson);
 
-const servers = SERVERS;
+const servers$1 = SERVERS;
 /* global SERVERS */
 
 const projects = PROJECTS;
@@ -63,7 +65,7 @@ const DisplayStartupConfiguration = config => {
   /* eslint-disable no-console */
   console.log();
   console.log(`Configured servers:
-`, JSON.stringify(servers, null, 2));
+`, JSON.stringify(servers$1, null, 2));
   console.log();
   console.log(`Configured projects:
 `, JSON.stringify(projects, null, 2));
@@ -73,15 +75,15 @@ const DisplayStartupConfiguration = config => {
   /* eslint-enable no-console */
 };
 
-const servers$1 = SERVERS;
+const servers = SERVERS;
 /* global SERVERS */
 
-const apiProxy = httpProxy__default['default'].createProxyServer();
+const apiProxy = httpProxy__default["default"].createProxyServer();
 
 const reverseProxies = (app, reverseProxyPaths = []) => {
   deliveryApiProxy(apiProxy, app);
   app.all(reverseProxyPaths, (req, res) => {
-    const target = req.hostname.indexOf('preview-') || req.hostname.indexOf('preview.') || req.hostname === 'localhost' ? servers$1.previewIis || servers$1.iis : servers$1.iis;
+    const target = req.hostname.indexOf('preview-') || req.hostname.indexOf('preview.') || req.hostname === 'localhost' ? servers.previewIis || servers.iis : servers.iis;
     apiProxy.web(req, res, {
       target,
       changeOrigin: true
@@ -98,8 +100,8 @@ const deliveryApiProxy = (apiProxy, app) => {
   // This is just here to stop cors requests on localhost. In Production this is mapped using varnish.
   app.all(['/api/delivery/*', '/api/image/*'], (req, res) => {
     /* eslint-disable no-console */
-    const target = servers$1.cms;
-    console.log(`Proxying api request to ${servers$1.alias}`);
+    const target = servers.cms;
+    console.log(`Proxying api request to ${servers.alias}`);
     apiProxy.web(req, res, {
       target,
       changeOrigin: true
@@ -132,15 +134,15 @@ const bundleManipulationMiddleware = ({
   maxage,
   staticRoutePath
 }) => (req, res, next) => {
-  const filename = path__default['default'].basename(req.path);
+  const filename = path__default["default"].basename(req.path);
   const modernBundle = filename.endsWith('.mjs');
   const legacyBundle = filename.endsWith('.js');
 
   if ((legacyBundle || modernBundle) && filename.startsWith('runtime.')) {
-    const jsRuntimeLocation = path__default['default'].resolve(appRootPath, `dist/static/${modernBundle ? 'modern/js' : 'legacy/js'}/${filename}`);
+    const jsRuntimeLocation = path__default["default"].resolve(appRootPath, `dist/static/${modernBundle ? 'modern/js' : 'legacy/js'}/${filename}`);
 
     try {
-      const jsRuntimeBundle = fs__default['default'].readFileSync(jsRuntimeLocation, 'utf8');
+      const jsRuntimeBundle = fs__default["default"].readFileSync(jsRuntimeLocation, 'utf8');
       const modifiedBundle = replaceStaticPath(jsRuntimeBundle, staticRoutePath);
       if (maxage) res.set('Cache-Control', `public, max-age=${maxage}`);
       res.type('.js').send(modifiedBundle);
@@ -170,7 +172,7 @@ const resolveStartupMiddleware = ({
 }) => (req, res, next) => {
   if (startupScriptFilename !== 'startup.js' && req.path === `/${startupScriptFilename}`) {
     const startupFilePath = `dist/${staticFolderPath}/startup.js`;
-    const startupFileLocation = path__default['default'].resolve(appRootPath, startupFilePath);
+    const startupFileLocation = path__default["default"].resolve(appRootPath, startupFilePath);
     if (maxage) res.set('Cache-Control', `public, max-age=${maxage}`);
 
     try {
@@ -206,7 +208,7 @@ const staticAssets = (app, {
     startupScriptFilename: scripts.startup || startupScriptFilename,
     staticFolderPath
   }), // eslint-disable-next-line import/no-named-as-default-member
-  express__default['default'].static(`dist/${staticFolderPath}`, {
+  express__default["default"].static(`dist/${staticFolderPath}`, {
     // these maxage values are different in config but the same in runtime,
     // this one is somehow converted and should end up being the same as CacheDuration.static
     maxAge: CacheDuration.expressStatic
@@ -230,7 +232,7 @@ const handleResponse = (request, response, content, send = 'send') => {
   response[send](content);
 };
 
-const readFileSync = path => fs__default['default'].readFileSync(path, 'utf8');
+const readFileSync = path => fs__default["default"].readFileSync(path, 'utf8');
 
 const loadableBundleData = ({
   stats,
@@ -263,12 +265,12 @@ const loadableChunkExtractors = () => {
     const modern = new server.ChunkExtractor({
       entrypoints: ['app'],
       namespace: 'modern',
-      statsFile: path__default['default'].resolve('dist/modern/loadable-stats.json')
+      statsFile: path__default["default"].resolve('dist/modern/loadable-stats.json')
     });
     const legacy = new server.ChunkExtractor({
       entrypoints: ['app'],
       namespace: 'legacy',
-      statsFile: path__default['default'].resolve('dist/legacy/loadable-stats.json')
+      statsFile: path__default["default"].resolve('dist/legacy/loadable-stats.json')
     });
     const commonLoadableExtractor = {
       addChunk(chunk) {
@@ -317,7 +319,7 @@ const addStandardHeaders = (state, response, packagejson, groups) => {
   if (state) {
     try {
       console.info('About to add headers');
-      const routingSurrogateKeys = selectors.getImmutableOrJS(state, ['routing', 'surrogateKeys'], '');
+      const routingSurrogateKeys = selectors.selectSurrogateKeys(state);
       const surrogateKeyHeader = ` ${packagejson.name}-app ${routingSurrogateKeys}`;
       response.header('surrogate-key', surrogateKeyHeader);
       addVarnishAuthenticationHeaders(state, response, groups);
@@ -371,7 +373,7 @@ const webApp = (app, ReactApp, config) => {
   const attributes = stringifyAttributes(scripts.attributes);
   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'));
+  const versionInfo = JSON.parse(fs__default["default"].readFileSync(`dist/${staticFolderPath}/version.json`, 'utf8'));
   app.get('/*', async (request, response) => {
     const {
       url
@@ -389,7 +391,7 @@ const webApp = (app, ReactApp, config) => {
     const normaliseQs = q => q && q.toLowerCase() === 'true' ? true : false; // Determine functional params from QueryString and set access methods
 
 
-    const accessMethod = mapJson__default['default'](request.query, {
+    const accessMethod = mapJson__default["default"](request.query, {
       DYNAMIC: ({
         dynamic
       }) => normaliseQs(dynamic) || onlyDynamic,
@@ -419,14 +421,14 @@ const webApp = (app, ReactApp, config) => {
     const groups = allowedGroups && allowedGroups[project];
     store.dispatch(actions.setCurrentProject(project, groups, request.hostname));
     const loadableExtractor = loadableChunkExtractors();
-    const jsx = /*#__PURE__*/React__default['default'].createElement(server.ChunkExtractorManager, {
+    const jsx = /*#__PURE__*/React__default["default"].createElement(server.ChunkExtractorManager, {
       extractor: loadableExtractor === null || loadableExtractor === void 0 ? void 0 : loadableExtractor.commonLoadableExtractor
-    }, /*#__PURE__*/React__default['default'].createElement(reactRedux.Provider, {
+    }, /*#__PURE__*/React__default["default"].createElement(reactRedux.Provider, {
       store: store
-    }, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.StaticRouter, {
+    }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.StaticRouter, {
       context: context,
       location: url
-    }, /*#__PURE__*/React__default['default'].createElement(ReactApp, {
+    }, /*#__PURE__*/React__default["default"].createElement(ReactApp, {
       routes: routes,
       withEvents: withEvents
     }))));
@@ -459,7 +461,7 @@ const webApp = (app, ReactApp, config) => {
         reactHelmet.Helmet.rewind();
         const htmlAttributes = helmet.htmlAttributes.toString();
         let title = helmet.title.toString();
-        const metadata = helmet.meta.toString();
+        const metadata = helmet.meta.toString().concat(helmet.link.toString());
 
         if (context.url) {
           return response.redirect(302, context.url);
@@ -470,14 +472,11 @@ const webApp = (app, ReactApp, config) => {
         // code-split bundles for any page components as well as core app bundles
 
         const bundleTags = getBundleTags(loadableExtractor, scripts);
-        let serialisedReduxData = '';
+        let serialisedReduxData = serialize__default["default"](reduxState);
 
         if (context.statusCode !== 404) {
           // For a request that returns a redux state object as a response
           if (accessMethod.REDUX) {
-            serialisedReduxData = serialize__default['default'](reduxState, {
-              ignoreFunction: true
-            });
             addStandardHeaders(reduxState, response, packagejson, {
               allowedGroups,
               globalGroups
@@ -487,9 +486,6 @@ const webApp = (app, ReactApp, config) => {
           }
 
           if (!disableSsrRedux) {
-            serialisedReduxData = serialize__default['default'](reduxState, {
-              ignoreFunction: true
-            });
             serialisedReduxData = `<script ${attributes}>window.REDUX_DATA = ${serialisedReduxData}</script>`;
           }
         }
@@ -503,17 +499,17 @@ const webApp = (app, ReactApp, config) => {
         if (context.statusCode === 404) title = '<title>404 page not found</title>'; // Static page served as a fragment
 
         if (accessMethod.FRAGMENT && accessMethod.STATIC) {
-          responseHTML = minifyCssString__default['default'](styleTags) + html;
+          responseHTML = minifyCssString__default["default"](styleTags) + html;
         } // Page fragment served with client scripts and redux data that hydrate the app client side
 
 
         if (accessMethod.FRAGMENT && !accessMethod.STATIC) {
-          responseHTML = templateHTMLFragment.replace('{{TITLE}}', title).replace('{{SEO_CRITICAL_METADATA}}', metadata).replace('{{CRITICAL_CSS}}', minifyCssString__default['default'](styleTags)).replace('{{APP}}', html).replace('{{LOADABLE_CHUNKS}}', bundleTags).replace('{{REDUX_DATA}}', serialisedReduxData);
+          responseHTML = templateHTMLFragment.replace('{{TITLE}}', title).replace('{{SEO_CRITICAL_METADATA}}', metadata).replace('{{CRITICAL_CSS}}', minifyCssString__default["default"](styleTags)).replace('{{APP}}', html).replace('{{LOADABLE_CHUNKS}}', bundleTags).replace('{{REDUX_DATA}}', serialisedReduxData);
         } // Full HTML page served statically
 
 
         if (!accessMethod.FRAGMENT && accessMethod.STATIC) {
-          responseHTML = templateHTMLStatic.replace('{{TITLE}}', title).replace('{{SEO_CRITICAL_METADATA}}', metadata).replace('{{CRITICAL_CSS}}', minifyCssString__default['default'](styleTags)).replace('{{APP}}', html).replace('{{LOADABLE_CHUNKS}}', '');
+          responseHTML = templateHTMLStatic.replace('{{TITLE}}', title).replace('{{SEO_CRITICAL_METADATA}}', metadata).replace('{{CRITICAL_CSS}}', minifyCssString__default["default"](styleTags)).replace('{{APP}}', html).replace('{{LOADABLE_CHUNKS}}', '');
         } // Full HTML page served with client scripts and redux data that hydrate the app client side
 
 
@@ -553,7 +549,7 @@ const webApp = (app, ReactApp, config) => {
   });
 };
 
-const app = express__default['default']();
+const app = express__default["default"]();
 
 const start = (ReactApp, config, ServerFeatures) => {
   global.PACKAGE_JSON = config.packagejson;
@@ -593,5 +589,5 @@ var internalServer = {
 };
 
 exports.ReactApp = App.AppRoot;
-exports.default = internalServer;
+exports["default"] = internalServer;
 //# sourceMappingURL=contensis-react-base.js.map