@zengenti/contensis-react-base 4.0.1-beta.1 → 4.0.1-beta.3

package/cjs/contensis-react-base.js

@@ -1316,7 +1316,10 @@ const webApp = (app, ReactApp, config) => {
   let isRenderingJsxToString = config.renderToString || false;
   const bundleData = getBundleData(config, staticRoutePath);
   const attributes = stringifyAttributes(scripts.attributes);
-  scripts.startup = scripts.startup || startupScriptFilename;
+  scripts.startup =
+  // We don't need the startup script with SSR in development
+  // as globals are baked into the client-side development bundles
+  process.env.NODE_ENV === 'development' ? undefined : scripts.startup || startupScriptFilename;
   let responseHandler = handleResponse;
   if (typeof handleResponses === 'function') {
     responseHandler = handleResponses;
@@ -1469,7 +1472,7 @@ const webApp = (app, ReactApp, config) => {
 
     // Render the JSX server side and send response as per access method options
     if (!accessMethod.DYNAMIC) {
-      store$1.runSaga(App.rootSaga(withSagas)).toPromise().then(() => {
+      store$1.runSaga(App.rootSaga(withSagas)).toPromise().then(async () => {
         var _selectCurrentSearch;
         const reduxState = store$1.getState();
         let clonedState = lodashClean.buildCleaner({
@@ -1549,6 +1552,13 @@ const webApp = (app, ReactApp, config) => {
         let title = helmet.title.toString().includes('><') ? helmetAsync.title.toString() : helmet.title.toString();
         const metadata = helmetAsync.meta.toString().concat(helmetAsync.base.toString()).concat(helmetAsync.priority.toString()).concat(helmetAsync.link.toString()).concat(helmetAsync.script.toString()).concat(helmetAsync.noscript.toString()).concat(helmet.meta.toString()).concat(helmet.base.toString()).concat(helmet.link.toString()).concat(helmet.script.toString()).concat(helmet.noscript.toString());
         try {
+          var _config$styles, _loadableExtractor$mo, _loadableExtractor$mo2;
+          // Getting style tags generated by "CSS Modules" because they will be
+          // available to loadable stats if we have built parts of the app with CSS
+          // plugins that are not within styled-components
+          // Render inline styles for CSS Modules if configured
+          const cssModuleStyles = (_config$styles = config.styles) !== null && _config$styles !== void 0 && _config$styles.inline ? await (loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo = loadableExtractor.modern) === null || _loadableExtractor$mo === void 0 ? void 0 : _loadableExtractor$mo.getInlineStyleTags()) : loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo2 = loadableExtractor.modern) === null || _loadableExtractor$mo2 === void 0 ? void 0 : _loadableExtractor$mo2.getStyleTags();
+
           /**
            * Loads all page assets into the provided templateHTML
            *
@@ -1559,7 +1569,6 @@ const webApp = (app, ReactApp, config) => {
            * if the context has requested a redirect
            * */
           const getContextHtml = (isFinal = false, styleTags, renderedJsxMarkup) => {
-            var _loadableExtractor$mo;
             if (context.url) {
               response.redirect(context.statusCode || 302, context.url);
               return '';
@@ -1574,18 +1583,13 @@ const webApp = (app, ReactApp, config) => {
             // Set response.status from React StaticRouter
             if (typeof context.statusCode === 'number') response.status(context.statusCode);
             const bundleTags = isFinal ? getBundleTags(loadableExtractor, scripts, staticRoutePath) : '';
-
-            // Getting style tags generated by "CSS Modules" because they will be
-            // available to loadable stats if we have built parts of the app with CSS
-            // plugins that are not within styled-components
-            const styles = loadableExtractor === null || loadableExtractor === void 0 || (_loadableExtractor$mo = loadableExtractor.modern) === null || _loadableExtractor$mo === void 0 ? void 0 : _loadableExtractor$mo.getStyleTags();
             const html = replaceHtml({
               bundleTags,
               html: renderedJsxMarkup,
               htmlAttributes,
               metadata,
               state: serialisedReduxData,
-              styleTags: `${styleTags || ''}${styles || ''}`,
+              styleTags: `${styleTags || ''}${cssModuleStyles || ''}`,
               title,
               templateHTML,
               templateHTMLFragment,