@zengenti/contensis-react-base 3.0.2-beta.4 → 3.0.2-beta.40

package/cjs/contensis-react-base.js

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var App = require('./App-a2783f8b.js');
+var ContensisDeliveryApi = require('./ContensisDeliveryApi-9e32960d.js');
 var contensisDeliveryApi = require('contensis-delivery-api');
 var React = require('react');
 var reactRedux = require('react-redux');
-var sagas = require('./sagas-8a20e424.js');
 var mapJson = require('jsonpath-mapper');
 require('reselect');
 require('deepmerge');
 require('query-string');
+var sagas = require('./sagas-e04b94c1.js');
 require('immer');
 require('deep-equal');
 var contensisCoreApi = require('contensis-core-api');
@@ -27,31 +27,33 @@ var reactRouterDom = require('react-router-dom');
 var reactRouterConfig = require('react-router-config');
 var reactHelmet = require('react-helmet');
 var styled = require('styled-components');
-var serialize$1 = require('serialize-javascript');
+var serialize = require('serialize-javascript');
 var minifyCssString = require('minify-css-string');
 var server$1 = require('@loadable/server');
 var lodash = require('lodash');
+var _commonjsHelpers = require('./_commonjsHelpers-b3309d7b.js');
 var lodashClean = require('lodash-clean');
 var reactCookie = require('react-cookie');
-var version = require('./version-bf9ef45e.js');
-var actions = require('./actions-8dc9e8de.js');
-var selectors = require('./selectors-656da4b7.js');
+var cookiesMiddleware = require('universal-cookie-express');
+var version = require('./version-79a027cb.js');
+var App = require('./App-7ff737fa.js');
+var version$1 = require('./version-afd4f77e.js');
+var selectors = require('./selectors-46b689d0.js');
 var chalk = require('chalk');
-require('history');
-require('@redux-saga/core/effects');
+require('./CookieConstants-000427db.js');
 require('loglevel');
-require('./version-eba6d09b.js');
-require('./login-e711a19e.js');
-require('./reducers-73a03ef4.js');
-require('./ToJs-a9a8522b.js');
-require('await-to-js');
-require('js-cookie');
-require('react-hot-loader');
-require('./RouteLoader-3aa6456e.js');
+require('@redux-saga/core/effects');
 require('redux');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
+require('./reducers-9afb5f89.js');
+require('history');
+require('await-to-js');
+require('./ChangePassword.container-a617190b.js');
+require('./ToJs-149fc5e1.js');
+require('react-hot-loader');
+require('./RouteLoader-049e81e5.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -62,8 +64,9 @@ var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize$1);
+var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var minifyCssString__default = /*#__PURE__*/_interopDefaultLegacy(minifyCssString);
+var cookiesMiddleware__default = /*#__PURE__*/_interopDefaultLegacy(cookiesMiddleware);
 var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
 
 /**
@@ -74,26 +77,20 @@ class Util {
     if (fieldId) {
       return entries === null || entries === void 0 ? void 0 : entries.map(e => {
         var _e$fieldId, _e$fieldId2, _e$fieldId2$sys;
-
         return Array.isArray(e === null || e === void 0 ? void 0 : e[fieldId]) ? e === null || e === void 0 ? void 0 : (_e$fieldId = e[fieldId]) === null || _e$fieldId === void 0 ? void 0 : _e$fieldId.map(f => {
           var _f$sys;
-
           return f === null || f === void 0 ? void 0 : (_f$sys = f.sys) === null || _f$sys === void 0 ? void 0 : _f$sys.id;
         }) : (e === null || e === void 0 ? void 0 : (_e$fieldId2 = e[fieldId]) === null || _e$fieldId2 === void 0 ? void 0 : (_e$fieldId2$sys = _e$fieldId2.sys) === null || _e$fieldId2$sys === void 0 ? void 0 : _e$fieldId2$sys.id) || '';
       }).flat();
     }
-
     return entries === null || entries === void 0 ? void 0 : entries.map(e => {
       var _e$sys;
-
       return (e === null || e === void 0 ? void 0 : (_e$sys = e.sys) === null || _e$sys === void 0 ? void 0 : _e$sys.id) || '';
     });
   }
-
   static GetItems(result) {
     return this.GetResults(result) ? result.items : [];
   }
-
   static GetResults(result) {
     if (result !== null && result !== void 0 && result.items) {
       return result;
@@ -101,20 +98,18 @@ class Util {
       return null;
     }
   }
-
 }
 const mergeResults = (results, parentResults, replaceContentTypeIds, linkFieldId) => results.map(r => {
   if (replaceContentTypeIds.some(c => c === r.sys.contentTypeId)) {
     const resolvedParent = parentResults === null || parentResults === void 0 ? void 0 : parentResults.find(e => {
       var _e$linkFieldId;
-
       return (_e$linkFieldId = e[linkFieldId]) === null || _e$linkFieldId === void 0 ? void 0 : _e$linkFieldId.some(l => {
         var _l$sys;
-
         return ((_l$sys = l.sys) === null || _l$sys === void 0 ? void 0 : _l$sys.id) === r.sys.id;
       });
     });
-    if (resolvedParent) return { ...resolvedParent,
+    if (resolvedParent) return {
+      ...resolvedParent,
       ...r,
       entryTitle: resolvedParent.entryTitle,
       entryDescription: resolvedParent.entryDescription,
@@ -122,12 +117,10 @@ const mergeResults = (results, parentResults, replaceContentTypeIds, linkFieldId
       originalSys: r.sys
     };else return r;
   }
-
   return r;
 }).filter(r => r);
 
 /* eslint-disable no-console */
-
 /**
  * Builds our complete Delivery API Query object from a set of provided arguments
  * @param queryParams
@@ -152,13 +145,12 @@ const searchQuery = ({
   const expressions$1 = [...sagas.defaultExpressions(versionStatus), ...sagas.contentTypeIdExpression(contentTypeIds, webpageTemplates, assetTypes), ...sagas.customWhereExpressions(customWhere), ...sagas.filterExpressions(filters), ...sagas.filterExpressions(idFilters), ...((sharedFilters === null || sharedFilters === void 0 ? void 0 : sharedFilters.length) > 0 ? [contensisCoreApi.Op.or(...sagas.filterExpressions(sharedFilters, true))] : []), ...sagas.termExpressions(searchTerm || '', weightedSearchFields || [])];
   const query = new contensisCoreApi.Query(...expressions$1);
   query.orderBy = sagas.orderByExpression(orderBy || []);
-
   if (fields && fields.length > 0) {
     query.fields = fields;
-  } // (query as any).includeArchived = true;
-  // (query as any).includeDeleted = true;
-
+  }
 
+  // (query as any).includeArchived = true;
+  // (query as any).includeDeleted = true;
   query.pageIndex = pageIndex;
   query.pageSize = pageSize;
   return query;
@@ -181,7 +173,8 @@ const finalQuery = ({
   webpageTemplates,
   weightedSearchFields
 }, children) => {
-  const expressions$1 = [...sagas.defaultExpressions(versionStatus), contensisCoreApi.Op.or(contensisCoreApi.Op.and(...sagas.contentTypeIdExpression(contentTypeIds, webpageTemplates, assetTypes), ...sagas.filterExpressions(filters), ...sagas.filterExpressions(idFilters || []), ...(sharedFilters !== null && sharedFilters !== void 0 && sharedFilters.length ? [contensisCoreApi.Op.or(...sagas.filterExpressions(sharedFilters || []) // Op.and(
+  const expressions$1 = [...sagas.defaultExpressions(versionStatus), contensisCoreApi.Op.or(contensisCoreApi.Op.and(...sagas.contentTypeIdExpression(contentTypeIds, webpageTemplates, assetTypes), ...sagas.filterExpressions(filters), ...sagas.filterExpressions(idFilters || []), ...(sharedFilters !== null && sharedFilters !== void 0 && sharedFilters.length ? [contensisCoreApi.Op.or(...sagas.filterExpressions(sharedFilters || [])
+  // Op.and(
   //   ...sharedFilters.map(sf =>
   //     Op.not(exp.fieldExpression(sf.key, true, 'exists')[0])
   //   ),
@@ -190,17 +183,17 @@ const finalQuery = ({
   )] : [])), ...children.map(child => contensisCoreApi.Op.and(...sagas.contentTypeIdExpression(child.contentTypeIds, child.webpageTemplates, child.assetTypes), ...sagas.filterExpressions(child.sharedFilters || []), ...sagas.filterExpressions(child.idFilters || [])))), ...sagas.termExpressions(searchTerm || '', weightedSearchFields || [])];
   const query = new contensisCoreApi.Query(...expressions$1);
   query.orderBy = sagas.orderByExpression(orderBy || []);
-
   if (fields && fields.length > 0) {
     query.fields = fields;
-  } // (query as any).includeArchived = true;
-  // (query as any).includeDeleted = true;
-
+  }
 
+  // (query as any).includeArchived = true;
+  // (query as any).includeDeleted = true;
   query.pageIndex = pageIndex || 0;
   query.pageSize = pageSize;
   return query;
 };
+
 /**
  * Create a filter expression from a provided filters configuration object
  * and populate them based on the presence of that key in params, filter
@@ -209,13 +202,10 @@ const finalQuery = ({
  * @param params request.query object from Express middleware
  * @returns FilterExpression[] we can use to use with searchQuery function
  */
-
 const makeFilterExpressions = (f, params) => {
   const expressions = [];
-
   for (const [paramKey, filterConfig] of Object.entries(f)) {
     var _params$paramKey;
-
     const filterValues = (_params$paramKey = params[paramKey]) === null || _params$paramKey === void 0 ? void 0 : _params$paramKey.split(',');
     if (typeof filterValues !== 'undefined') expressions.push({
       key: typeof filterConfig === 'object' ? filterConfig.fieldId : filterConfig,
@@ -224,7 +214,6 @@ const makeFilterExpressions = (f, params) => {
       logicOperator: typeof filterConfig === 'object' && filterConfig.logicOperator ? filterConfig.logicOperator : 'or'
     });
   }
-
   return expressions;
 };
 const makeDerivedIdsFilterExpression = (prevFieldId, entries, ownIds = false, alwaysApplyFilter = false) => {
@@ -252,12 +241,11 @@ const resolveParentEntries = async (parentContentTypeIds, replaceContentTypeIds,
   });
   query.fields = params.fields ? [...JSON.parse(params.fields), parentFieldId] : [];
   if (debug) console.log(`\nResolve parent entries query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
-  const parentResults = await App.cachedSearch.searchUsingPost(query, Number(params.linkDepth || 0), params.projectId);
+  const parentResults = await ContensisDeliveryApi.cachedSearch.searchUsingPost(query, Number(params.linkDepth || 0), params.projectId);
   return mergeResults(results, Util.GetItems(parentResults), replaceContentTypeIds, parentFieldId);
 };
 
 /* eslint-disable no-console */
-
 class QueryLevelResults {
   constructor({
     level: _level,
@@ -290,13 +278,11 @@ class QueryLevelResults {
     this.firstResults = {};
     this.finalQuery = new contensisDeliveryApi.Query();
     this.finalResults = {};
-
     this.AddChild = ({
       child
     }) => {
       this.children.push(child);
     };
-
     this.RunFirstQuery = async () => {
       const {
         firstQuery: query,
@@ -304,18 +290,17 @@ class QueryLevelResults {
         parent,
         runFirstQuery
       } = this;
-
       if (parent !== null && parent !== void 0 && parent.validatedLinks.length) {
         // add any idFilters derived from parent query results
         appendSearchQueryFilters(query, makeFilterExpressions(Object.fromEntries(parent.validatedLinks.map(vl => [vl.linkFieldId, {
           fieldId: `sys.id`
         }])), Object.fromEntries(parent.validatedLinks.map(vl => [vl.linkFieldId, vl.entryIds.join(',') || `no ids from parent ${parent.level}`]))));
       }
-
       if (runFirstQuery) {
         if (this.debug) console.log(`\nLevel ${this.level} - First query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
-        this.firstResults = await App.cachedSearch.searchUsingPost(query, 0, params.projectId); // mapResultsToValidatedLinks
+        this.firstResults = await ContensisDeliveryApi.cachedSearch.searchUsingPost(query, 0, params.projectId);
 
+        // mapResultsToValidatedLinks
         for (const linkFieldId of this.linkFieldIds) {
           this.validatedLinks.push({
             contentTypeId: this.linkFields[linkFieldId].contentTypeId || '',
@@ -325,7 +310,6 @@ class QueryLevelResults {
         }
       }
     };
-
     this.RunFinalQuery = async () => {
       const {
         level,
@@ -334,31 +318,30 @@ class QueryLevelResults {
         params,
         runFinalQuery
       } = this;
-
       if (!children.some(c => c.returnEntries)) {
-        const firstChild = children === null || children === void 0 ? void 0 : children[0]; // add any idFilters derived from child query results
-
+        const firstChild = children === null || children === void 0 ? void 0 : children[0];
+        // add any idFilters derived from child query results
         if (firstChild) appendSearchQueryFilters(query, makeFilterExpressions(Object.fromEntries(firstChild.validatedLinks.map(vl => [vl.linkFieldId, {
           fieldId: `${vl.linkFieldId}.sys.id`
         }])), Object.fromEntries(firstChild.validatedLinks.map(vl => [vl.linkFieldId, vl.entryIds.join(',') || `no ids from child ${firstChild.level}`]))));
       }
-
       if (level === 0 && this.returnEntries) {
         // This is the final query to be run and response returned to the caller
         // Only this bit cares about linkDepth, fields and pagination parameters
         query.fields = JSON.parse(params.fields || '[]');
         query.pageSize = params.pageSize;
-        query.pageIndex = params.pageIndex; // query.orderBy = params.orderBy;
+        query.pageIndex = params.pageIndex;
+        // query.orderBy = params.orderBy;
       }
 
       if (runFinalQuery) {
         if (this.debug) console.log(`\nLevel ${this.level} - Final query: \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
-        this.finalResults = await App.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId);
-        if (this.parent) this.parent.runFinalQuery = true; // mapResultsToValidatedLinks
+        this.finalResults = await ContensisDeliveryApi.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId);
+        if (this.parent) this.parent.runFinalQuery = true;
 
+        // mapResultsToValidatedLinks
         for (const linkFieldId of ((_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.linkFieldIds) || []) {
           var _this$parent, _this$parent2;
-
           this.validatedLinks.push({
             contentTypeId: ((_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.linkFields[linkFieldId].contentTypeId) || '',
             linkFieldId,
@@ -367,17 +350,14 @@ class QueryLevelResults {
         }
       }
     };
-
     this.GetResultsEntries = () => {
       var _finalResults$items;
-
       const {
         finalResults,
         firstResults
       } = this;
       return finalResults !== null && finalResults !== void 0 && (_finalResults$items = finalResults.items) !== null && _finalResults$items !== void 0 && _finalResults$items.length ? finalResults.items : firstResults.items;
     };
-
     this.GetResults = () => {
       const {
         finalResults,
@@ -385,7 +365,6 @@ class QueryLevelResults {
       } = this;
       return typeof (finalResults === null || finalResults === void 0 ? void 0 : finalResults.totalCount) !== 'undefined' ? finalResults : firstResults;
     };
-
     this.level = _level;
     this.contentTypeIds = contentTypeIds;
     this.linkFields = linkFields;
@@ -422,11 +401,9 @@ class QueryLevelResults {
       versionStatus: _params.versionStatus
     });
   }
-
 }
 
 /* eslint-disable no-console */
-
 class LinkDepthSearchService {
   constructor({
     contentTypeId: _contentTypeId = '',
@@ -443,29 +420,27 @@ class LinkDepthSearchService {
     this.params = void 0;
     this.debug = void 0;
     this.queryLevels = void 0;
-
     this.DoSearch = async () => {
       // Run queries "top-down" through each level of `linkField`
       for (const queryLevel of this.queryLevels) {
         await queryLevel.RunFirstQuery();
-      } // Run queries "bottom-up" through each level of `linkField`
-
+      }
 
+      // Run queries "bottom-up" through each level of `linkField`
       for (const queryLevel of [...this.queryLevels].reverse()) {
         await queryLevel.RunFinalQuery();
-      } // Run a final query that will aggregate the results from all levels
-      // adding all levels to the query that have `returnEntries` set true
-
+      }
 
+      // Run a final query that will aggregate the results from all levels
+      // adding all levels to the query that have `returnEntries` set true
       return await this.RunFinalQueries();
     };
-
     this.RunFinalQueries = async () => {
-      const finalQueryLevels = this.queryLevels.filter(ql => ql.level > 0 && ql.returnEntries || ql.level === 0 && ql.returnEntries !== false); // Decide if we need a further final query if any child level(s) have had `returnEntries` set to true
+      const finalQueryLevels = this.queryLevels.filter(ql => ql.level > 0 && ql.returnEntries || ql.level === 0 && ql.returnEntries !== false);
 
+      // Decide if we need a further final query if any child level(s) have had `returnEntries` set to true
       if (finalQueryLevels.length > 1 || finalQueryLevels.length === 1 && finalQueryLevels[0].level !== 0) {
         var _params$orderBy;
-
         // Build final query
         const {
           contentTypeIds,
@@ -480,9 +455,9 @@ class LinkDepthSearchService {
           }
         }, {
           [vl.linkFieldId]: vl.entryIds.join(',') || 'no results for filter'
-        })).flat() || []; // This is the final query to be run and response returned to the caller
+        })).flat() || [];
+        // This is the final query to be run and response returned to the caller
         // Only this bit cares about linkDepth, fields and pagination parameters
-
         const query = finalQuery({
           contentTypeIds,
           filters: makeFilterExpressions(filters, params),
@@ -490,7 +465,6 @@ class LinkDepthSearchService {
           idFilters: derivedIdFilters,
           fields: params.fields ? [...JSON.parse(params.fields), ...finalQueryLevels.map(l => {
             var _l$parent;
-
             return ((_l$parent = l.parent) === null || _l$parent === void 0 ? void 0 : _l$parent.linkFieldIds) || [];
           }).flat()] : [],
           orderBy: (_params$orderBy = params.orderBy) === null || _params$orderBy === void 0 ? void 0 : _params$orderBy.split(','),
@@ -500,7 +474,6 @@ class LinkDepthSearchService {
           versionStatus: params.versionStatus
         }, (finalQueryLevels === null || finalQueryLevels === void 0 ? void 0 : finalQueryLevels[0].children.filter(ql => ql.returnEntries).map(ql => {
           var _ql$parent, _ql$parent2;
-
           const entriesAtLevel = ql.GetResultsEntries() || ((_ql$parent = ql.parent) === null || _ql$parent === void 0 ? void 0 : _ql$parent.GetResultsEntries());
           const previousIdsFilter = ql.returnEntries || !!ql.children.some(qc => qc.returnEntries) ? (_ql$parent2 = ql.parent) === null || _ql$parent2 === void 0 ? void 0 : _ql$parent2.linkFieldIds.map(fieldId => makeDerivedIdsFilterExpression(fieldId, entriesAtLevel, true, ql.runFinalQuery)).flat() : [];
           return {
@@ -511,29 +484,28 @@ class LinkDepthSearchService {
           };
         })) || []);
         if (this.debug) console.log(`\nFinal query: ${derivedIds.reduce((accumulator, object) => accumulator + object.entryIds.length, 0)} derived ids \n${JSON.stringify(query.toJSON()).substring(0, 1000)}`);
-        const finalQueryResult = await App.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId); // Resolve any parent entries
+        const finalQueryResult = await ContensisDeliveryApi.cachedSearch.searchUsingPost(query, Number(params.linkDepth) || 0, params.projectId);
+
+        // Resolve any parent entries
 
         const resolveParentLevels = finalQueryLevels.filter(ql => ql.resolveFirstParent);
         let entries = finalQueryResult.items;
-
         for (const resolveParents of resolveParentLevels) {
           var _resolveParents$paren, _resolveParents$paren2;
-
-          entries = await resolveParentEntries(((_resolveParents$paren = resolveParents.parent) === null || _resolveParents$paren === void 0 ? void 0 : _resolveParents$paren.contentTypeIds) || [], resolveParents.contentTypeIds, ((_resolveParents$paren2 = resolveParents.parent) === null || _resolveParents$paren2 === void 0 ? void 0 : _resolveParents$paren2.linkFieldIds[0]) || 'unknown', finalQueryResult.items, // or entries?
+          entries = await resolveParentEntries(((_resolveParents$paren = resolveParents.parent) === null || _resolveParents$paren === void 0 ? void 0 : _resolveParents$paren.contentTypeIds) || [], resolveParents.contentTypeIds, ((_resolveParents$paren2 = resolveParents.parent) === null || _resolveParents$paren2 === void 0 ? void 0 : _resolveParents$paren2.linkFieldIds[0]) || 'unknown', finalQueryResult.items,
+          // or entries?
           this.params, this.debug);
         }
-
-        return { ...finalQueryResult,
+        return {
+          ...finalQueryResult,
           items: entries
         };
       } else {
         var _this$queryLevels$fin;
-
         if (this.debug) console.log(`\nNo further queries required\n`);
         return (_this$queryLevels$fin = this.queryLevels.find(ql => ql.level === 0)) === null || _this$queryLevels$fin === void 0 ? void 0 : _this$queryLevels$fin.GetResults();
       }
     };
-
     this.InitQueryLevels = () => {
       const createChildQueryLevels = (linkFields, parentQueryLevel, level = 1) => {
         return Object.entries(linkFields).map(([, {
@@ -566,7 +538,6 @@ class LinkDepthSearchService {
           return [thisLevel, ...createChildQueryLevels(linkFields, thisLevel, level + 1)];
         }).flat();
       };
-
       const {
         contentTypeIds,
         filters,
@@ -587,17 +558,17 @@ class LinkDepthSearchService {
         params,
         debug: this.debug
       });
-      const queryLevels = [firstLevel, ...createChildQueryLevels(linkFields, firstLevel)]; // return queryLevels;
+      const queryLevels = [firstLevel, ...createChildQueryLevels(linkFields, firstLevel)];
+      // return queryLevels;
+
       // If we are only returning entries from level 0
       // we can skip running the first query and finalQuery will suffice
-
       if (queryLevels.find(ql => ql.returnEntries && ql.level !== 0)) return queryLevels;else return queryLevels.map(ql => {
-        ql.runFirstQuery = false; // ql.runFinalQuery = false;
-
+        ql.runFirstQuery = false;
+        // ql.runFinalQuery = false;
         return ql;
       });
     };
-
     this.contentTypeIds = Array.isArray(_contentTypeId) ? _contentTypeId : [_contentTypeId];
     this.filters = _filters;
     this.sharedFilters = _sharedFilters;
@@ -606,7 +577,6 @@ class LinkDepthSearchService {
     this.debug = debug;
     this.queryLevels = this.InitQueryLevels();
   }
-
 }
 
 /**
@@ -626,10 +596,9 @@ const makeLinkDepthApi = (app, middlewareConfig) => {
   if (!contentTypeId || !linkFields || !uri) return;
   app.get(uri, makeLinkDepthMiddleware(middlewareConfig));
 };
+
 /** Create a content type hierarchy from supplied config and produces
  * a RequestHandler function to serve our Express middleware */
-
-
 const makeLinkDepthMiddleware = ({
   contentTypeId,
   filters = {},
@@ -645,8 +614,9 @@ const makeLinkDepthMiddleware = ({
         urls.setCachingHeaders(res, {
           cacheControl: 'private',
           surrogateControl: '10'
-        }); // Gather all params from the request, we will use them at the right query levels later
+        });
 
+        // Gather all params from the request, we will use them at the right query levels later
         const params = Object.fromEntries([...Object.entries(req.params), ...Object.entries(req.query)].map(([k, v]) => [k, v === null || v === void 0 ? void 0 : v.toString()]));
         const result = await new LinkDepthSearchService({
           contentTypeId,
@@ -664,35 +634,25 @@ const makeLinkDepthMiddleware = ({
         res.json(error);
       }
     };
-
     return linkDepthMiddleware;
   } catch (error) {
     // This will be an error building the middleware
     // we can only serve what the error was as the request handler instead
     console.error(error);
-
     const errorMiddleware = async (req, res) => {
       res.statusCode = 500;
       res.json(JSON.stringify(error));
     };
-
     return errorMiddleware;
   }
 };
 
-const servers$1 = SERVERS;
-/* global SERVERS */
-
-const project = PROJECT;
-/* global PROJECT */
-
-const alias = ALIAS;
-/* global ALIAS */
-
-const deliveryApiHostname = urls.url(alias, project).api;
+const servers$1 = SERVERS; /* global SERVERS */
+const project = PROJECT; /* global PROJECT */
+const alias$1 = ALIAS; /* global ALIAS */
+const deliveryApiHostname = urls.url(alias$1, project).api;
 const assetProxy = httpProxy__default["default"].createProxyServer();
 const deliveryProxy = httpProxy__default["default"].createProxyServer();
-
 const reverseProxies = (app, reverseProxyPaths = []) => {
   deliveryApiProxy(deliveryProxy, app);
   app.all(reverseProxyPaths, (req, res) => {
@@ -732,8 +692,8 @@ const CacheDuration = {
   static: '31536000',
   // Believe it or not these two max ages are the same in runtime
   expressStatic: '31557600h' // Believe it or not these two max ages are the same in runtime
-
 };
+
 const getCacheDuration = (status = 200) => {
   if (status > 400) return CacheDuration[404];
   return CacheDuration[200];
@@ -750,10 +710,8 @@ const bundleManipulationMiddleware = ({
   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/${staticFolderPath}/${modernBundle ? 'modern/js' : 'legacy/js'}/${filename}`);
-
     try {
       const jsRuntimeBundle = fs__default["default"].readFileSync(jsRuntimeLocation, 'utf8');
       const modifiedBundle = replaceStaticPath(jsRuntimeBundle, staticRoutePath);
@@ -776,7 +734,6 @@ const bundleManipulationMiddleware = ({
  * @returns Response | next()
  * A middleware function to resolve /dist/static/startup.js under a supplied startupScriptFilename variable
  */
-
 const resolveStartupMiddleware = ({
   appRootPath,
   maxage,
@@ -785,7 +742,6 @@ const resolveStartupMiddleware = ({
 }) => async (req, res, next) => {
   if (startupScriptFilename !== 'startup.js' && req.path === `/${startupScriptFilename}`) {
     let startupFileLocation = '';
-
     try {
       const startupFilePaths = [`dist/static/startup.js`, `dist/${staticFolderPath}/startup.js`];
       let startupFilePath = '';
@@ -793,7 +749,8 @@ const resolveStartupMiddleware = ({
         try {
           fs__default["default"].accessSync(testPath);
           startupFilePath = testPath;
-        } catch (ex) {// Do nothing
+        } catch (ex) {
+          // Do nothing
         }
       });
       startupFileLocation = path__default["default"].resolve(appRootPath, startupFilePath);
@@ -830,7 +787,8 @@ const staticAssets = (app, {
     maxage: CacheDuration.static,
     startupScriptFilename: scripts.startup || startupScriptFilename,
     staticFolderPath
-  }), // eslint-disable-next-line import/no-named-as-default-member
+  }),
+  // eslint-disable-next-line import/no-named-as-default-member
   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
@@ -838,11 +796,8 @@ const staticAssets = (app, {
   }));
 };
 
-const servers = SERVERS;
-/* global SERVERS */
-
-const projects = PROJECTS;
-/* global PROJECTS */
+const servers = SERVERS; /* global SERVERS */
+const projects = PROJECTS; /* global PROJECTS */
 
 const DisplayStartupConfiguration = config => {
   /* eslint-disable no-console */
@@ -859,8 +814,6 @@ const DisplayStartupConfiguration = config => {
   /* eslint-enable no-console */
 };
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
 /**
  * Removes all key-value entries from the list cache.
  *
@@ -1140,7 +1093,7 @@ var _stackHas = stackHas$1;
 
 /** Detect free variable `global` from Node.js. */
 
-var freeGlobal$1 = typeof commonjsGlobal == 'object' && commonjsGlobal && commonjsGlobal.Object === Object && commonjsGlobal;
+var freeGlobal$1 = typeof _commonjsHelpers.commonjsGlobal == 'object' && _commonjsHelpers.commonjsGlobal && _commonjsHelpers.commonjsGlobal.Object === Object && _commonjsHelpers.commonjsGlobal;
 
 var _freeGlobal = freeGlobal$1;
 
@@ -3643,332 +3596,6 @@ function cloneDeep(value) {
 
 var cloneDeep_1 = cloneDeep;
 
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/**
- * Module exports.
- * @public
- */
-
-var parse_1 = parse;
-var serialize_1 = serialize;
-
-/**
- * Module variables.
- * @private
- */
-
-var decode = decodeURIComponent;
-var encode = encodeURIComponent;
-
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- *
- * @param {string} str
- * @param {object} [options]
- * @return {object}
- * @public
- */
-
-function parse(str, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('argument str must be a string');
-  }
-
-  var obj = {};
-  var opt = options || {};
-  var pairs = str.split(';');
-  var dec = opt.decode || decode;
-
-  for (var i = 0; i < pairs.length; i++) {
-    var pair = pairs[i];
-    var index = pair.indexOf('=');
-
-    // skip things that don't look like key=value
-    if (index < 0) {
-      continue;
-    }
-
-    var key = pair.substring(0, index).trim();
-
-    // only assign once
-    if (undefined == obj[key]) {
-      var val = pair.substring(index + 1, pair.length).trim();
-
-      // quoted values
-      if (val[0] === '"') {
-        val = val.slice(1, -1);
-      }
-
-      obj[key] = tryDecode(val, dec);
-    }
-  }
-
-  return obj;
-}
-
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-
-    if (isNaN(maxAge) || !isFinite(maxAge)) {
-      throw new TypeError('option maxAge is invalid')
-    }
-
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
-/**
- * Try decoding a string using a decoding function.
- *
- * @param {string} str
- * @param {function} decode
- * @private
- */
-
-function tryDecode(str, decode) {
-  try {
-    return decode(str);
-  } catch (e) {
-    return str;
-  }
-}
-
-function hasDocumentCookie() {
-    // Can we get/set cookies on document.cookie?
-    return typeof document === 'object' && typeof document.cookie === 'string';
-}
-function parseCookies(cookies, options) {
-    if (typeof cookies === 'string') {
-        return parse_1(cookies, options);
-    }
-    else if (typeof cookies === 'object' && cookies !== null) {
-        return cookies;
-    }
-    else {
-        return {};
-    }
-}
-function isParsingCookie(value, doNotParse) {
-    if (typeof doNotParse === 'undefined') {
-        // We guess if the cookie start with { or [, it has been serialized
-        doNotParse =
-            !value || (value[0] !== '{' && value[0] !== '[' && value[0] !== '"');
-    }
-    return !doNotParse;
-}
-function readCookie(value, options) {
-    if (options === void 0) { options = {}; }
-    var cleanValue = cleanupCookieValue(value);
-    if (isParsingCookie(cleanValue, options.doNotParse)) {
-        try {
-            return JSON.parse(cleanValue);
-        }
-        catch (e) {
-            // At least we tried
-        }
-    }
-    // Ignore clean value if we failed the deserialization
-    // It is not relevant anymore to trim those values
-    return value;
-}
-function cleanupCookieValue(value) {
-    // express prepend j: before serializing a cookie
-    if (value && value[0] === 'j' && value[1] === ':') {
-        return value.substr(2);
-    }
-    return value;
-}
-
-var __assign = (undefined && undefined.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var Cookies = /** @class */ (function () {
-    function Cookies(cookies, options) {
-        var _this = this;
-        this.changeListeners = [];
-        this.HAS_DOCUMENT_COOKIE = false;
-        this.cookies = parseCookies(cookies, options);
-        new Promise(function () {
-            _this.HAS_DOCUMENT_COOKIE = hasDocumentCookie();
-        }).catch(function () { });
-    }
-    Cookies.prototype._updateBrowserValues = function (parseOptions) {
-        if (!this.HAS_DOCUMENT_COOKIE) {
-            return;
-        }
-        this.cookies = parse_1(document.cookie, parseOptions);
-    };
-    Cookies.prototype._emitChange = function (params) {
-        for (var i = 0; i < this.changeListeners.length; ++i) {
-            this.changeListeners[i](params);
-        }
-    };
-    Cookies.prototype.get = function (name, options, parseOptions) {
-        if (options === void 0) { options = {}; }
-        this._updateBrowserValues(parseOptions);
-        return readCookie(this.cookies[name], options);
-    };
-    Cookies.prototype.getAll = function (options, parseOptions) {
-        if (options === void 0) { options = {}; }
-        this._updateBrowserValues(parseOptions);
-        var result = {};
-        for (var name_1 in this.cookies) {
-            result[name_1] = readCookie(this.cookies[name_1], options);
-        }
-        return result;
-    };
-    Cookies.prototype.set = function (name, value, options) {
-        var _a;
-        if (typeof value === 'object') {
-            value = JSON.stringify(value);
-        }
-        this.cookies = __assign(__assign({}, this.cookies), (_a = {}, _a[name] = value, _a));
-        if (this.HAS_DOCUMENT_COOKIE) {
-            document.cookie = serialize_1(name, value, options);
-        }
-        this._emitChange({ name: name, value: value, options: options });
-    };
-    Cookies.prototype.remove = function (name, options) {
-        var finalOptions = (options = __assign(__assign({}, options), { expires: new Date(1970, 1, 1, 0, 0, 1), maxAge: 0 }));
-        this.cookies = __assign({}, this.cookies);
-        delete this.cookies[name];
-        if (this.HAS_DOCUMENT_COOKIE) {
-            document.cookie = serialize_1(name, '', finalOptions);
-        }
-        this._emitChange({ name: name, value: undefined, options: options });
-    };
-    Cookies.prototype.addChangeListener = function (callback) {
-        this.changeListeners.push(callback);
-    };
-    Cookies.prototype.removeChangeListener = function (callback) {
-        var idx = this.changeListeners.indexOf(callback);
-        if (idx >= 0) {
-            this.changeListeners.splice(idx, 1);
-        }
-    };
-    return Cookies;
-}());
-var Cookies$1 = Cookies;
-
 var stringifyAttributes = ((attributes = {}) => Object.entries(attributes).map(([key, value], idx) => `${idx !== 0 ? ' ' : ''}${key}${value ? `="${value}"` : ''}`).join(' '));
 
 /* eslint-disable no-console */
@@ -3987,20 +3614,17 @@ const handleResponse = (request, response, content, send = 'send') => {
 };
 
 const readFileSync = path => fs__default["default"].readFileSync(path, 'utf8');
-
 const loadableBundleData = ({
   stats,
   templates
 }, staticRoutePath, build) => {
   const bundle = {};
-
   try {
     bundle.stats = stats ? JSON.parse(readFileSync(stats.replace('/target', build ? `/${build}` : ''))) : null;
   } catch (ex) {
     // console.info(ex);
     bundle.stats = null;
   }
-
   try {
     bundle.templates = {
       templateHTML: replaceStaticPath(readFileSync(templates.html.replace('/target', build ? `/${build}` : '')), staticRoutePath),
@@ -4011,18 +3635,15 @@ const loadableBundleData = ({
     // console.info(ex);
     bundle.templates = null;
   }
-
   return bundle;
 };
 const loadableChunkExtractors = () => {
   const commonLoadableExtractor = new server$1.ChunkExtractor({
     stats: {}
   });
-
   try {
     let modern;
     let legacy;
-
     try {
       modern = new server$1.ChunkExtractor({
         entrypoints: ['app'],
@@ -4032,7 +3653,6 @@ const loadableChunkExtractors = () => {
     } catch (e) {
       console.info('@loadable/server modern ChunkExtractor not available');
     }
-
     try {
       legacy = new server$1.ChunkExtractor({
         entrypoints: ['app'],
@@ -4042,14 +3662,11 @@ const loadableChunkExtractors = () => {
     } catch (e) {
       console.info('@loadable/server legacy ChunkExtractor not available');
     }
-
     commonLoadableExtractor.addChunk = chunk => {
       var _modern, _legacy, _legacy2;
-
       (_modern = modern) === null || _modern === void 0 ? void 0 : _modern.addChunk(chunk);
       if (typeof ((_legacy = legacy) === null || _legacy === void 0 ? void 0 : _legacy.stats.assetsByChunkName[chunk]) !== 'undefined') (_legacy2 = legacy) === null || _legacy2 === void 0 ? void 0 : _legacy2.addChunk(chunk);
     };
-
     return {
       commonLoadableExtractor,
       modern,
@@ -4068,9 +3685,11 @@ const getBundleData = (config, staticRoutePath) => {
     legacy: loadableBundleData(config, staticRoutePath, 'legacy'),
     modern: loadableBundleData(config, staticRoutePath, 'modern')
   };
-  if (!bundleData.default || bundleData.default === {}) bundleData.default = bundleData.legacy || bundleData.modern;
+  if (!bundleData.default || Object.keys(bundleData.default || {}).length === 0) bundleData.default = bundleData.legacy || bundleData.modern;
   return bundleData;
-}; // export const buildBundleTags = (
+};
+
+// export const buildBundleTags = (
 //   bundles,
 //   differentialBundles = false,
 //   staticRoutePath = 'static',
@@ -4095,17 +3714,18 @@ const getBundleData = (config, staticRoutePath) => {
 //       )}"></script>`;
 //     })
 //     .filter(f => f);
+
 //   return bundleTags;
 // };
 
 const getBundleTags = (loadableExtractor, scripts, staticRoutePath = 'static') => {
-  let startupTag = ''; // Add the static startup script to the bundleTags
-
-  if (scripts !== null && scripts !== void 0 && scripts.startup) startupTag = `<script ${stringifyAttributes(scripts.attributes)} src="/${staticRoutePath}/${scripts.startup}"></script>`; // Get the script tags from their respective extractor instances
+  let startupTag = '';
+  // Add the static startup script to the bundleTags
+  if (scripts !== null && scripts !== void 0 && scripts.startup) startupTag = `<script ${stringifyAttributes(scripts.attributes)} src="/${staticRoutePath}/${scripts.startup}"></script>`;
 
+  // Get the script tags from their respective extractor instances
   if (loadableExtractor) {
     var _loadableExtractor$le, _loadableExtractor$mo;
-
     const legacyScriptTags = (_loadableExtractor$le = loadableExtractor.legacy) === null || _loadableExtractor$le === void 0 ? void 0 : _loadableExtractor$le.getScriptTags({
       nomodule: 'nomodule'
     });
@@ -4115,19 +3735,25 @@ const getBundleTags = (loadableExtractor, scripts, staticRoutePath = 'static') =
     const scriptTags = `${startupTag}${legacyScriptTags || ''}${modernScriptTags || ''}`.replace(/"\/static\//g, `"/${staticRoutePath}/`);
     return scriptTags;
   }
-
   return startupTag;
 };
 
+const alias = ALIAS; /* global ALIAS */
+
 const addStandardHeaders = (state, response, packagejson, groups) => {
   if (state) {
     try {
       console.info('About to add headers');
       const routingSurrogateKeys = selectors.selectSurrogateKeys(state);
-      const surrogateKeyHeader = ` ${packagejson.name}-app ${routingSurrogateKeys}`;
-      response.header('surrogate-key', surrogateKeyHeader);
+
+      // Check length of surrogate keys and prevent potential header overflow
+      // errors in prod by replacing with `any-update` header that will indiscriminately
+      // invalidate the SSR page cache when any content is updated
+      const surrogateKeys = routingSurrogateKeys.length >= 2000 ? `${alias}_any-update` : routingSurrogateKeys.join(' ');
+      const surrogateKeyHeader = `${packagejson.name}-app ${surrogateKeys}`;
+      response.setHeader('surrogate-key', surrogateKeyHeader);
       addVarnishAuthenticationHeaders(state, response, groups);
-      response.setHeader('Surrogate-Control', `max-age=${getCacheDuration(response.statusCode)}`);
+      response.setHeader('surrogate-control', `max-age=${getCacheDuration(response.statusCode)}`);
     } catch (e) {
       console.info('Error Adding headers', e.message);
     }
@@ -4141,14 +3767,12 @@ const addVarnishAuthenticationHeaders = (state, response, groups = {}) => {
       const {
         globalGroups,
         allowedGroups
-      } = groups; // console.info(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);
@@ -4168,18 +3792,18 @@ const getVersionInfo = staticFolderPath => {
 };
 
 /* eslint-disable no-console */
-const unhandledExceptionHandler = (handleExceptions = true) => {
-  const exceptionTypes = handleExceptions === true ? ['uncaughtException', 'unhandledRejection', 'SIGTERM', 'SIGINT'] // Default exception types to add event listeners for
-  : Array.isArray(handleExceptions) // In future we could accept an array of specific exception types to handle for a specific application?
-  ? handleExceptions : [];
 
+// Default exception types to add event listeners for
+const handleDefaultEvents = ['uncaughtException', 'unhandledRejection'];
+const unhandledExceptionHandler = (handleExceptions = handleDefaultEvents) => {
+  const exceptionTypes = Array.isArray(handleExceptions) ? handleExceptions : handleExceptions === false ? [] : handleDefaultEvents;
   for (const type of exceptionTypes) {
     process.on(type, err => {
       if (err && err instanceof Error) {
         // Print a message to inform admins and developers the error should not be ignored
         console.log(`${`[contensis-react-base] ❌ ${chalk__default["default"].red.bold(`${type} - ${err.message}`)}`}`);
-        console.log(chalk__default["default"].gray` - you are seeing this because we have tried to prevent the app from completely crashing - you should not ignore this problem`); // Log the error to server console
-
+        console.log(chalk__default["default"].gray` - you are seeing this because we have tried to prevent the app from completely crashing - you should not ignore this problem`);
+        // Log the error to server console
         console.error(err);
       }
     });
@@ -4208,27 +3832,23 @@ const webApp = (app, ReactApp, config) => {
   const attributes = stringifyAttributes(scripts.attributes);
   scripts.startup = scripts.startup || startupScriptFilename;
   const responseHandler = typeof handleResponses === 'function' ? handleResponses : handleResponse;
-  if (handleExceptions !== false) unhandledExceptionHandler(); // Create `process.on` event handlers for unhandled exceptions (Node v15+)
+  if (handleExceptions !== false) unhandledExceptionHandler(handleExceptions); // Create `process.on` event handlers for unhandled exceptions (Node v15+)
 
   const versionInfo = getVersionInfo(staticFolderPath);
-  app.get('/*', async (request, response) => {
+  app.get('/*', cookiesMiddleware__default["default"](), async (request, response) => {
     const {
       url
     } = request;
-    const cookies = new Cookies$1(request.headers.cookie);
-
     const matchedStaticRoute = () => reactRouterConfig.matchRoutes(routes.StaticRoutes, request.path);
-
     const isStaticRoute = () => matchedStaticRoute().length > 0;
+    const staticRoute = isStaticRoute() && matchedStaticRoute()[0];
 
-    const staticRoute = isStaticRoute() && matchedStaticRoute()[0]; // Allow certain routes to avoid SSR
-
+    // Allow certain routes to avoid SSR
     const onlyDynamic = staticRoute && staticRoute.route.ssr === false;
     const onlySSR = staticRoute && staticRoute.route.ssrOnly === true;
+    const normaliseQs = q => q && q.toLowerCase() === 'true' ? true : false;
 
-    const normaliseQs = q => q && q.toLowerCase() === 'true' ? true : false; // Determine functional params from QueryString and set access methods
-
-
+    // Determine functional params from QueryString and set access methods
     const accessMethod = mapJson__default["default"](request.query, {
       DYNAMIC: ({
         dynamic
@@ -4243,26 +3863,32 @@ const webApp = (app, ReactApp, config) => {
         static: value
       }) => normaliseQs(value) || onlySSR
     });
-    const context = {}; // Track the current statusCode via the response object
-
-    response.status(200); // Create a store (with a memory history) from our current url
+    const context = {};
+    // Track the current statusCode via the response object
+    response.status(200);
 
+    // Create a store (with a memory history) from our current url
     const store = await version.createStore(withReducers, {}, App.history({
       initialEntries: [url]
-    }), stateType); // dispatch any global and non-saga related actions before calling our JSX
-
-    const versionStatus = App.deliveryApi.getServerSideVersionStatus(request);
-    console.info(`Request for ${request.path} hostname: ${request.hostname} versionStatus: ${versionStatus}`);
-    store.dispatch(version.setVersionStatus(versionStatus));
-    store.dispatch(version.setVersion(versionInfo.commitRef, versionInfo.buildNo));
-    const project = App.pickProject(request.hostname, request.query);
+    }), stateType);
+
+    // dispatch any global and non-saga related actions before calling our JSX
+    const versionStatus = ContensisDeliveryApi.deliveryApi.getServerSideVersionStatus(request);
+
+    // In server-side blocks world, the hostname requested by the client resides in the x-orig-host header
+    // Because of this, we prioritize x-orig-host when setting our hostname
+    const hostname = request.headers['x-orig-host'] || request.hostname;
+    console.info(`Request for ${request.path} hostname: ${hostname} versionStatus: ${versionStatus}`);
+    store.dispatch(version$1.setVersionStatus(versionStatus));
+    store.dispatch(version$1.setVersion(versionInfo.commitRef, versionInfo.buildNo));
+    const project = App.pickProject(hostname, request.query);
     const groups = allowedGroups && allowedGroups[project];
-    store.dispatch(actions.setCurrentProject(project, groups, request.hostname));
+    store.dispatch(selectors.setCurrentProject(project, groups, hostname));
     const loadableExtractor = loadableChunkExtractors();
     const jsx = /*#__PURE__*/React__default["default"].createElement(server$1.ChunkExtractorManager, {
       extractor: loadableExtractor.commonLoadableExtractor
     }, /*#__PURE__*/React__default["default"].createElement(reactCookie.CookiesProvider, {
-      cookies: cookies
+      cookies: request.universalCookies
     }, /*#__PURE__*/React__default["default"].createElement(reactRedux.Provider, {
       store: store
     }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.StaticRouter, {
@@ -4276,23 +3902,25 @@ const webApp = (app, ReactApp, config) => {
       templateHTML = '',
       templateHTMLFragment = '',
       templateHTMLStatic = ''
-    } = bundleData.default.templates || bundleData.legacy.templates || {}; // Serve a blank HTML page with client scripts to load the app in the browser
+    } = bundleData.default.templates || bundleData.legacy.templates || {};
 
+    // Serve a blank HTML page with client scripts to load the app in the browser
     if (accessMethod.DYNAMIC) {
       // Dynamic doesn't need sagas
-      server$2.renderToString(jsx); // Dynamic page render has only the necessary bundles to start up the app
-      // and does not include any react-loadable code-split bundles
+      server$2.renderToString(jsx);
 
+      // Dynamic page render has only the necessary bundles to start up the app
+      // and does not include any react-loadable code-split bundles
       const bundleTags = getBundleTags(loadableExtractor, scripts, staticRoutePath);
       const isDynamicHints = `<script ${attributes}>window.versionStatus = "${versionStatus}"; window.isDynamic = true;</script>`;
-      const responseHtmlDynamic = templateHTML.replace('{{TITLE}}', '').replace('{{SEO_CRITICAL_METADATA}}', '').replace('{{CRITICAL_CSS}}', '').replace('{{APP}}', '').replace('{{LOADABLE_CHUNKS}}', bundleTags).replace('{{REDUX_DATA}}', isDynamicHints); // Dynamic pages always return a 200 so we can run
+      const responseHtmlDynamic = templateHTML.replace('{{TITLE}}', '').replace('{{SEO_CRITICAL_METADATA}}', '').replace('{{CRITICAL_CSS}}', '').replace('{{APP}}', '').replace('{{LOADABLE_CHUNKS}}', bundleTags).replace('{{REDUX_DATA}}', isDynamicHints);
+      // Dynamic pages always return a 200 so we can run
       // the app and serve up all errors inside the client
-
       response.setHeader('Surrogate-Control', `max-age=${getCacheDuration(200)}`);
       responseHandler(request, response, responseHtmlDynamic);
-    } // Render the JSX server side and send response as per access method options
-
+    }
 
+    // Render the JSX server side and send response as per access method options
     if (!accessMethod.DYNAMIC) {
       store.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
         const sheet = new styled.ServerStyleSheet();
@@ -4302,15 +3930,14 @@ const webApp = (app, ReactApp, config) => {
         const htmlAttributes = helmet.htmlAttributes.toString();
         let title = helmet.title.toString();
         const metadata = helmet.meta.toString().concat(helmet.base.toString()).concat(helmet.link.toString()).concat(helmet.script.toString()).concat(helmet.noscript.toString());
-
         if (context.url) {
           return response.redirect(context.statusCode || 302, context.url);
         }
-
         const reduxState = store.getState();
-        const styleTags = sheet.getStyleTags(); // After running rootSaga there should be an additional react-loadable
-        // code-split bundles for any page components as well as core app bundles
+        const styleTags = sheet.getStyleTags();
 
+        // After running rootSaga there should be an additional react-loadable
+        // code-split bundles for any page components as well as core app bundles
         const bundleTags = getBundleTags(loadableExtractor, scripts, staticRoutePath);
         let serialisedReduxData = serialize__default["default"](lodashClean.buildCleaner({
           isArray: lodash.identity,
@@ -4322,7 +3949,6 @@ const webApp = (app, ReactApp, config) => {
           isString: lodash.identity,
           isUndefined: lodash.noop
         })(cloneDeep_1(reduxState)));
-
         if (context.statusCode !== 404) {
           // For a request that returns a redux state object as a response
           if (accessMethod.REDUX) {
@@ -4333,7 +3959,6 @@ const webApp = (app, ReactApp, config) => {
             responseHandler(request, response, serialisedReduxData, 'json');
             return true;
           }
-
           if (!disableSsrRedux) {
             // window.versionStatus is not strictly required here and is added to support cases
             // where a consumer may not be using the contensisVersionStatus in redux and calling
@@ -4341,41 +3966,40 @@ const webApp = (app, ReactApp, config) => {
             serialisedReduxData = `<script ${attributes}>window.versionStatus = "${versionStatus}"; window.REDUX_DATA = ${serialisedReduxData}</script>`;
           }
         }
-
-        if ((context.statusCode || 200) > 400) {
+        if ((context.statusCode || 200) >= 404) {
           accessMethod.STATIC = true;
-        } // Responses
-
+        }
 
+        // Responses
         let responseHTML = '';
-        if (context.statusCode === 404) title = '<title>404 page not found</title>'; // Static page served as a fragment
+        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;
-        } // Page fragment served with client scripts and redux data that hydrate the app client side
-
+        }
 
+        // 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);
-        } // Full HTML page served statically
-
+        }
 
+        // 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}}', '');
-        } // Full HTML page served with client scripts and redux data that hydrate the app client side
-
+        }
 
+        // Full HTML page served with client scripts and redux data that hydrate the app client side
         if (!accessMethod.FRAGMENT && !accessMethod.STATIC) {
           responseHTML = templateHTML.replace('{{TITLE}}', title).replace('{{SEO_CRITICAL_METADATA}}', metadata).replace('{{CRITICAL_CSS}}', styleTags).replace('{{APP}}', html).replace('{{LOADABLE_CHUNKS}}', bundleTags).replace('{{REDUX_DATA}}', serialisedReduxData);
-        } // Set response.status from React StaticRouter
-
+        }
 
+        // Set response.status from React StaticRouter
         if (typeof context.statusCode === 'number') response.status(context.statusCode);
         addStandardHeaders(reduxState, response, packagejson, {
           allowedGroups,
           globalGroups
         });
-
         try {
           // If react-helmet htmlAttributes are being used,
           // replace the html tag with those attributes sepcified
@@ -4383,7 +4007,6 @@ const webApp = (app, ReactApp, config) => {
           if (htmlAttributes) {
             responseHTML = responseHTML.replace(/<html?.+?>/, `<html ${htmlAttributes}>`);
           }
-
           responseHandler(request, response, responseHTML);
         } catch (err) {
           console.info(err.message);
@@ -4403,18 +4026,17 @@ const webApp = (app, ReactApp, config) => {
 
 const app = express__default["default"]();
 const server = http__default["default"].createServer(app);
-
 const start = (ReactApp, config, ServerFeatures) => {
   global.PACKAGE_JSON = config.packagejson;
   global.DISABLE_SSR_REDUX = config.disableSsrRedux;
   global.PROXY_DELIVERY_API = config.proxyDeliveryApi;
   global.REVERSE_PROXY_PATHS = Object(config.reverseProxyPaths);
-  app.disable('x-powered-by'); // Output some information about the used build/startup configuration
-
+  app.disable('x-powered-by');
+  // Output some information about the used build/startup configuration
   DisplayStartupConfiguration(config);
-  ServerFeatures(app); // Set-up local proxy for images from cms, and delivery api requests
+  ServerFeatures(app);
+  // Set-up local proxy for images from cms, and delivery api requests
   // to save doing rewrites and extra code
-
   reverseProxies(app, config.reverseProxyPaths);
   staticAssets(app, config);
   webApp(app, ReactApp, config);
@@ -4428,11 +4050,11 @@ const start = (ReactApp, config, ServerFeatures) => {
     app.on('stop', () => {
       server.close(function () {
         console.info('GoodBye :(');
+        process.exit();
       });
     });
   });
 };
-
 var internalServer = {
   app,
   apiProxy: deliveryProxy,