@zengenti/contensis-react-base 2.4.1-beta.7 → 2.5.1-beta.0

package/cjs/client.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('isomorphic-fetch');
-require('react-loadable');
-require('react');
-require('react-router-dom');
-require('react-redux');
+var Loadable = require('react-loadable');
+var React = require('react');
+var reactRouterDom = require('react-router-dom');
+var reactRedux = require('react-redux');
 require('react-router-config');
 require('jsonpath-mapper');
 require('immutable');
@@ -15,27 +15,132 @@ require('redux-immutable');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
-require('./injectors-72d5b989.js');
-require('./actions-e22726ed.js');
-require('./reducers-91e3e239.js');
+var version = require('./version-3a808c12.js');
+var actions = require('./actions-e9f69947.js');
+var reducers = require('./reducers-cb531715.js');
 require('history');
-var App = require('./App-f3164dab.js');
+var App = require('./App-8f560cc5.js');
 require('@redux-saga/core/effects');
 require('contensis-delivery-api');
 require('./version-2193b4a2.js');
-require('query-string');
-require('./selectors-69c3d37c.js');
+var queryString = require('query-string');
+require('./selectors-1295124a.js');
 require('loglevel');
-require('./ToJs-ca9bea03.js');
-require('./login-6c0ef139.js');
+require('./ToJs-d72e5b10.js');
+require('./login-4f274c6a.js');
 require('await-to-js');
 require('js-cookie');
-require('react-hot-loader');
-require('prop-types');
-require('./RouteLoader-5c44f039.js');
-require('react-dom');
+var reactHotLoader = require('react-hot-loader');
+require('./RouteLoader-f99cd734.js');
+var reactDom = require('react-dom');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+const fromJSLeaveImmer = js => {
+  // console.info(js);
+  // if (typeof js !== 'object' || js === null) return js;
+  // // console.info(`from js - here is js ${JSON.stringify(js)}`);
+  // const convertedObject = isOrdered ? OrderedMap() : fromJS({});
+  // const keys = Object.keys(js);
+  // keys.forEach(key => {
+  //   if (key === 'immer') {
+  //     convertedObject.set(key, js[key]);
+  //     // console.info(`LOOK! - immer untouched bar root key "${key}"`);
+  //   } else {
+  //     // console.info(`LOOK! - normal immutable feature "${key}"`);
+  //     convertedObject.set(key, isOrdered ? fromJSOrdered(js) : fromJS(js));
+  //   }
+  // });
+  const immutableObj = reducers.fromJSOrdered(js);
+
+  if (immutableObj && !!immutableObj.get('immer')) {
+    immutableObj.set('immer', immutableObj.get('immer').toJS());
+  }
+
+  return immutableObj;
+};
+
+class ClientApp {
+  constructor(ReactApp, config) {
+    const documentRoot = document.getElementById('root');
+    const {
+      routes,
+      withReducers,
+      withSagas,
+      withEvents
+    } = config;
+
+    const GetClientJSX = store => {
+      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, {
+        history: App.browserHistory
+      }, /*#__PURE__*/React__default['default'].createElement(ReactApp, {
+        routes: routes,
+        withEvents: withEvents
+      }))));
+      return ClientJsx;
+    };
+
+    const isProduction = !(process.env.NODE_ENV !== 'production');
+    /**
+     * Webpack HMR Setup.
+     */
+
+    const HMRRenderer = Component => {
+      Loadable.preloadReady().then(() => {
+        if (isProduction) reactDom.hydrate(Component, documentRoot);else reactDom.render(Component, documentRoot);
+      });
+    };
+
+    let store = null;
+    const qs = queryString.parse(window.location.search);
+    const versionStatusFromHostname = App.deliveryApi.getClientSideVersionStatus();
+
+    if (window.isDynamic || window.REDUX_DATA || process.env.NODE_ENV !== 'production') {
+      store = version.createStore(withReducers, fromJSLeaveImmer(window.REDUX_DATA), App.browserHistory);
+      store.dispatch(version.setVersionStatus(qs.versionStatus || versionStatusFromHostname));
+      /* eslint-disable no-console */
+
+      console.log('Hydrating from inline Redux');
+      /* eslint-enable no-console */
+
+      store.runSaga(App.rootSaga(withSagas));
+      store.dispatch(actions.setCurrentProject(App.pickProject(window.location.hostname, qs), [], window.location.hostname));
+      delete window.REDUX_DATA;
+      HMRRenderer(GetClientJSX(store));
+    } else {
+      fetch(`${window.location.pathname}?redux=true`).then(response => response.json()).then(data => {
+        /* eslint-disable no-console */
+        // console.log('Got Data Back');
+        // console.log(data);
+
+        /* eslint-enable no-console */
+        const ssRedux = JSON.parse(data);
+        store = version.createStore(withReducers, fromJSLeaveImmer(ssRedux), App.browserHistory); // store.dispatch(setVersionStatus(versionStatusFromHostname));
+
+        store.runSaga(App.rootSaga(withSagas));
+        store.dispatch(actions.setCurrentProject(App.pickProject(window.location.hostname, queryString.parse(window.location.search)), [], window.location.hostname)); // if (typeof window != 'undefined') {
+        //   store.dispatch(checkUserLoggedIn());
+        // }
+
+        HMRRenderer(GetClientJSX(store));
+      });
+    } // webpack Hot Module Replacement API
+
+
+    if (module.hot) {
+      module.hot.accept(ReactApp, () => {
+        // if you are using harmony modules ({modules:false})
+        HMRRenderer(GetClientJSX(store));
+      });
+    }
+  }
+
+}
 
 exports.ReactApp = App.AppRoot;
+exports.default = ClientApp;
 //# sourceMappingURL=client.js.map

package/cjs/client.js.map

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

package/cjs/contensis-react-base.js

@@ -8,42 +8,41 @@ var Loadable = require('react-loadable');
 var httpProxy = require('http-proxy');
 var fs = require('fs');
 var path = require('path');
+var appRootPath = require('app-root-path');
 var React = require('react');
+var server$1 = require('react-dom/server');
 var reactRouterDom = require('react-router-dom');
 var reactRedux = require('react-redux');
-var server = require('react-dom/server');
 var reactRouterConfig = require('react-router-config');
-var webpack = require('react-loadable/webpack');
-var styled = require('styled-components');
 var Helmet = require('react-helmet');
+var styled = require('styled-components');
 var serialize = require('serialize-javascript');
 var minifyCssString = require('minify-css-string');
 var mapJson = require('jsonpath-mapper');
+var server = require('@loadable/server');
 var immutable = require('immutable');
 require('redux');
 require('redux-immutable');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
-var injectors = require('./injectors-72d5b989.js');
-var actions = require('./actions-e22726ed.js');
-require('./reducers-91e3e239.js');
+var version = require('./version-3a808c12.js');
+var actions = require('./actions-e9f69947.js');
+require('./reducers-cb531715.js');
 require('history');
-var App = require('./App-f3164dab.js');
-var effects = require('@redux-saga/core/effects');
+var App = require('./App-8f560cc5.js');
+require('@redux-saga/core/effects');
 require('contensis-delivery-api');
 require('./version-2193b4a2.js');
 require('query-string');
-var selectors = require('./selectors-69c3d37c.js');
+var selectors = require('./selectors-1295124a.js');
 require('loglevel');
-require('./ToJs-ca9bea03.js');
-var login = require('./login-6c0ef139.js');
+require('./ToJs-d72e5b10.js');
+require('./login-4f274c6a.js');
 require('await-to-js');
 require('js-cookie');
-var version = require('./version-7d8852f6.js');
 require('react-hot-loader');
-require('prop-types');
-require('./RouteLoader-5c44f039.js');
+require('./RouteLoader-f99cd734.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -83,7 +82,7 @@ const servers$1 = SERVERS;
 
 const apiProxy = httpProxy__default['default'].createProxyServer();
 
-const reverseProxies = (app, reverseProxyPaths) => {
+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;
@@ -130,7 +129,7 @@ const getCacheDuration = (status = 200) => {
   return CacheDuration[200];
 };
 
-const replaceStaticPath = (string, staticFolderPath = 'static') => string.replace(/static\//g, `${staticFolderPath}/`);
+const replaceStaticPath = (str, staticFolderPath = 'static') => str.replace(/static\//g, `${staticFolderPath}/`);
 
 const bundleManipulationMiddleware = ({
   appRootPath,
@@ -190,8 +189,9 @@ const resolveStartupMiddleware = ({
   }
 };
 
+// Serving static assets
 const staticAssets = (app, {
-  appRootPath = require('app-root-path').path,
+  appRootPath: appRootPath$1 = appRootPath.path,
   scripts = {},
   startupScriptFilename = 'startup.js',
   staticFolderPath = 'static',
@@ -199,64 +199,118 @@ const staticAssets = (app, {
   staticRoutePaths = []
 }) => {
   app.use([`/${staticRoutePath}`, ...staticRoutePaths.map(p => `/${p}`), `/${staticFolderPath}`], bundleManipulationMiddleware({
-    appRootPath,
+    appRootPath: appRootPath$1,
     // these maxage values are different in config but the same in runtime,
     // this one is the true value in seconds
     maxage: CacheDuration.static,
     staticRoutePath
   }), resolveStartupMiddleware({
-    appRootPath,
+    appRootPath: appRootPath$1,
     maxage: CacheDuration.static,
     startupScriptFilename: scripts.startup || startupScriptFilename,
     staticFolderPath
-  }), express__default['default'].static(`dist/${staticFolderPath}`, {
+  }), // 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
-    maxage: CacheDuration.expressStatic
+    maxAge: CacheDuration.expressStatic
   }));
 };
 
-/*! fromentries. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-var fromentries = function fromEntries (iterable) {
-  return [...iterable].reduce((obj, [key, val]) => {
-    obj[key] = val;
-    return obj
-  }, {})
-};
-
-const userSagas = [...login.loginSagas, ...App.registerSagas];
-
-// index.js
-function rootSaga (featureSagas = []) {
-  return function* rootSaga() {
-    const subSagas = [...App.routingSagas, ...App.navigationSagas, ...userSagas];
-    yield effects.all([...subSagas, ...featureSagas]);
-  };
-}
-
-const ResponseMethod = {
-  send: 'send',
-  json: 'json',
-  end: 'end'
-};
-
 /* eslint-disable no-console */
+
 /**
  * Web Application Response handler, sends a prepared express js response
  * with the supplied content sending in the specified manner
  * @param {response} request express js request object
  * @param {response} response express js response object
  * @param {string | object} content the content to send in the response body
- * @param {function} send the response function to call e.g res.send() res.json() res.end()
+ * @param {"send" | "json" | "end"} send the response function to call e.g res.send() res.json() res.end()
  */
-
-const handleResponse = (request, response, content, send = ResponseMethod.send) => {
+const handleResponse = (request, response, content, send = 'send') => {
   // console.log('---', response.statusCode, '---');
   response[send](content);
 };
 
 var stringifyAttributes = ((attributes = {}) => Object.entries(attributes).map(([key, value], idx) => `${idx !== 0 ? ' ' : ''}${key}${value ? `="${value}"` : ''}`).join(' '));
 
+const readFileSync = path => fs__default['default'].readFileSync(path, 'utf8');
+
+const loadableBundleData = ({
+  stats,
+  templates
+}, staticRoutePath, build) => {
+  const bundle = {};
+
+  try {
+    bundle.stats = JSON.parse(readFileSync(stats.replace('/target', build ? `/${build}` : '')));
+  } catch (ex) {
+    // console.info(ex);
+    bundle.stats = null;
+  }
+
+  try {
+    bundle.templates = {
+      templateHTML: replaceStaticPath(readFileSync(templates.html.replace('/target', build ? `/${build}` : '')), staticRoutePath),
+      templateHTMLStatic: replaceStaticPath(readFileSync(templates.static.replace('/target', build ? `/${build}` : '')), staticRoutePath),
+      templateHTMLFragment: replaceStaticPath(readFileSync(templates.fragment.replace('/target', build ? `/${build}` : '')), staticRoutePath)
+    };
+  } catch (ex) {
+    // console.info(ex);
+    bundle.templates = null;
+  }
+
+  return bundle;
+};
+const loadableChunkExtractors = () => {
+  try {
+    const modern = new server.ChunkExtractor({
+      entrypoints: ['app'],
+      namespace: 'modern',
+      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')
+    });
+    const commonLoadableExtractor = {
+      addChunk(chunk) {
+        modern.addChunk(chunk);
+        if (typeof legacy.stats.assetsByChunkName[chunk] !== 'undefined') legacy.addChunk(chunk);
+      }
+
+    };
+    return {
+      commonLoadableExtractor,
+      modern,
+      legacy
+    };
+  } catch (e) {
+    console.info('@loadable/server ChunkExtractor not available');
+  }
+};
+const getBundleData = (config, staticRoutePath) => {
+  const bundleData = {
+    default: loadableBundleData(config, staticRoutePath),
+    legacy: loadableBundleData(config, staticRoutePath, 'legacy'),
+    modern: loadableBundleData(config, staticRoutePath, 'modern')
+  };
+  if (!bundleData.default || bundleData.default === {}) bundleData.default = bundleData.legacy || bundleData.modern;
+  return bundleData;
+};
+const getBundleTags = loadableExtractor => {
+  if (loadableExtractor) {
+    const legacyScriptTags = loadableExtractor === null || loadableExtractor === void 0 ? void 0 : loadableExtractor.legacy.getScriptTags({
+      noModule: true
+    });
+    const modernScriptTags = loadableExtractor === null || loadableExtractor === void 0 ? void 0 : loadableExtractor.modern.getScriptTags({
+      type: 'module'
+    });
+    return legacyScriptTags + modernScriptTags;
+  }
+};
+
 const addStandardHeaders = (state, response, packagejson, groups) => {
   if (state) {
     try {
@@ -271,7 +325,6 @@ const addStandardHeaders = (state, response, packagejson, groups) => {
     }
   }
 };
-
 const addVarnishAuthenticationHeaders = (state, response, groups = {}) => {
   if (state) {
     try {
@@ -295,35 +348,6 @@ const addVarnishAuthenticationHeaders = (state, response, groups = {}) => {
   }
 };
 
-const readFileSync = path => fs__default['default'].readFileSync(path, 'utf8');
-
-const loadableBundleData = ({
-  stats,
-  templates
-}, staticRoutePath, build) => {
-  const bundle = {};
-
-  try {
-    bundle.stats = JSON.parse(readFileSync(stats.replace('/target', build ? `/${build}` : '')));
-  } catch (ex) {
-    //console.info(ex);
-    bundle.stats = null;
-  }
-
-  try {
-    bundle.templates = {
-      templateHTML: replaceStaticPath(readFileSync(templates.html.replace('/target', build ? `/${build}` : '')), staticRoutePath),
-      templateHTMLStatic: replaceStaticPath(readFileSync(templates.static.replace('/target', build ? `/${build}` : '')), staticRoutePath),
-      templateHTMLFragment: replaceStaticPath(readFileSync(templates.fragment.replace('/target', build ? `/${build}` : '')), staticRoutePath)
-    };
-  } catch (ex) {
-    //console.info(ex);
-    bundle.templates = null;
-  }
-
-  return bundle;
-};
-
 const webApp = (app, ReactApp, config) => {
   const {
     routes,
@@ -341,12 +365,7 @@ const webApp = (app, ReactApp, config) => {
     handleResponses
   } = config;
   const staticRoutePath = config.staticRoutePath || staticFolderPath;
-  const bundleData = {
-    default: loadableBundleData(config, staticRoutePath),
-    legacy: loadableBundleData(config, staticRoutePath, 'legacy'),
-    modern: loadableBundleData(config, staticRoutePath, 'modern')
-  };
-  if (!bundleData.default || bundleData.default === {}) bundleData.default = bundleData.legacy || bundleData.modern;
+  const bundleData = getBundleData(config, staticRoutePath);
   const attributes = stringifyAttributes(scripts.attributes);
   scripts.startup = scripts.startup || startupScriptFilename;
   const responseHandler = typeof handleResponses === 'function' ? handleResponses : handleResponse;
@@ -386,7 +405,7 @@ const webApp = (app, ReactApp, config) => {
 
     response.status(200); // Create a store (with a memory history) from our current url
 
-    const store = injectors.createStore(withReducers, immutable.fromJS({}), App.history({
+    const store = version.createStore(withReducers, immutable.fromJS({}), App.history({
       initialEntries: [url]
     })); // dispatch any global and non-saga related actions before calling our JSX
 
@@ -397,9 +416,9 @@ const webApp = (app, ReactApp, config) => {
     const project = App.pickProject(request.hostname, request.query);
     const groups = allowedGroups && allowedGroups[project];
     store.dispatch(actions.setCurrentProject(project, groups, request.hostname));
-    const modules = [];
-    const jsx = /*#__PURE__*/React__default['default'].createElement(Loadable__default['default'].Capture, {
-      report: moduleName => modules.push(moduleName)
+    const loadableExtractor = loadableChunkExtractors();
+    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, {
       store: store
     }, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.StaticRouter, {
@@ -409,33 +428,22 @@ const webApp = (app, ReactApp, config) => {
       routes: routes,
       withEvents: withEvents
     }))));
-
-    const buildBundleTags = bundles => {
-      // Take the bundles returned from Loadable.Capture
-      const bundleTags = bundles.filter(b => b).map(bundle => {
-        if (bundle.publicPath.includes('/modern/')) return differentialBundles ? `<script ${attributes} type="module" src="${replaceStaticPath(bundle.publicPath, staticRoutePath)}"></script>` : null;
-        return `<script ${attributes} nomodule src="${replaceStaticPath(bundle.publicPath, staticRoutePath)}"></script>`;
-      }).filter(f => f); // Add the static startup script to the bundleTags
-
-      scripts.startup && bundleTags.push(`<script ${attributes} src="/${staticRoutePath}/${scripts.startup}"></script>`);
-      return bundleTags;
-    };
-
     const templates = bundleData.default.templates || bundleData.legacy.templates;
-    const stats = bundleData.modern.stats && bundleData.legacy.stats ? fromentries(Object.entries(bundleData.modern.stats).map(([lib, paths]) => [lib, bundleData.legacy.stats[lib] ? [...paths, ...bundleData.legacy.stats[lib]] : paths])) : bundleData.default.stats;
     const {
       templateHTML,
       templateHTMLFragment,
       templateHTMLStatic
-    } = templates; // Serve a blank HTML page with client scripts to load the app in the browser
+    } = 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.renderToString(jsx); // Dynamic page render has only the necessary bundles to start up the app
+      server$1.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 loadableBundles = webpack.getBundles(stats, modules);
-      const bundleTags = buildBundleTags(loadableBundles).join('');
+      let bundleTags = ''; // Add the static startup script to the bundleTags
+
+      if (scripts.startup) bundleTags = `<script ${attributes} src="/${staticRoutePath}/${scripts.startup}"></script>`;
+      bundleTags += getBundleTags(loadableExtractor);
       const isDynamicHint = `<script ${attributes}>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}}', isDynamicHint); // Dynamic pages always return a 200 so we can run
       // the app and serve up all errors inside the client
@@ -446,9 +454,9 @@ const webApp = (app, ReactApp, config) => {
 
 
     if (!accessMethod.DYNAMIC) {
-      store.runSaga(rootSaga(withSagas)).toPromise().then(() => {
+      store.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
         const sheet = new styled.ServerStyleSheet();
-        const html = server.renderToString(sheet.collectStyles(jsx));
+        const html = server$1.renderToString(sheet.collectStyles(jsx));
         const helmet = Helmet__default['default'].renderStatic();
         Helmet__default['default'].rewind();
         const htmlAttributes = helmet.htmlAttributes.toString();
@@ -463,11 +471,13 @@ const webApp = (app, ReactApp, config) => {
         const styleTags = sheet.getStyleTags(); // After running rootSaga there should be an additional react-loadable
         // code-split bundle for a page component as well as core app bundles
 
-        const loadableBundles = webpack.getBundles(stats, modules);
-        const bundleTags = buildBundleTags(loadableBundles).join('');
+        let bundleTags = ''; // Add the static startup script to the bundleTags
+
+        if (scripts.startup) bundleTags = `<script ${attributes} src="/${staticRoutePath}/${scripts.startup}"></script>`;
+        bundleTags += getBundleTags(loadableExtractor);
         let serialisedReduxData = '';
 
-        if (context.status !== 404) {
+        if (context.statusCode !== 404) {
           // For a request that returns a redux state object as a response
           if (accessMethod.REDUX) {
             serialisedReduxData = serialize__default['default'](reduxState, {
@@ -489,13 +499,13 @@ const webApp = (app, ReactApp, config) => {
           }
         }
 
-        if (context.status > 400) {
+        if ((context.statusCode || 200) > 400) {
           accessMethod.STATIC = true;
         } // Responses
 
 
         let responseHTML = '';
-        if (context.status === 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;
@@ -517,7 +527,7 @@ const webApp = (app, ReactApp, config) => {
         } // Set response.status from React StaticRouter
 
 
-        if (typeof context.status === 'number') response.status(context.status);
+        if (typeof context.statusCode === 'number') response.status(context.statusCode);
         addStandardHeaders(reduxState, response, packagejson, {
           allowedGroups,
           globalGroups
@@ -542,7 +552,7 @@ const webApp = (app, ReactApp, config) => {
         response.status(500);
         responseHandler(request, response, `Error occurred: <br />${err.stack} <br />${JSON.stringify(err)}`);
       });
-      server.renderToString(jsx);
+      server$1.renderToString(jsx);
       store.close();
     }
   });
@@ -552,9 +562,9 @@ const app = express__default['default']();
 
 const start = (ReactApp, config, ServerFeatures) => {
   global.PACKAGE_JSON = config.packagejson;
-  global.REVERSE_PROXY_PATHS = Object(config.reverseProxyPaths);
-  global.PROXY_DELIVERY_API = config.proxyDeliveryApi;
   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
 
   DisplayStartupConfiguration(config);
@@ -566,9 +576,9 @@ const start = (ReactApp, config, ServerFeatures) => {
   webApp(app, ReactApp, config);
   app.on('ready', async () => {
     // Configure DNS to make life easier
-    //await ConfigureLocalDNS();
+    // await ConfigureLocalDNS();
     Loadable__default['default'].preloadAll().then(() => {
-      var server = app.listen(3001, () => {
+      const server = app.listen(3001, () => {
         console.info(`HTTP server is listening @ port 3001`);
         setTimeout(function () {
           app.emit('app_started');