@griddo/cx 1.74.37 → 1.75.1

package/gatsby-browser.js

@@ -92,9 +92,9 @@ exports.shouldUpdateScroll = props => {
   }
 };
 
-exports.wrapRootElement = props => {
+exports.wrapPageElement = props => {
   if (browser.wrapPageElement) {
-    return browser.wrapRootElement(props);
+    return browser.wrapPageElement(props);
   }
 };
 

package/gatsby-node.js

@@ -129,6 +129,7 @@ exports.createPages = async ({ actions }) => {
       useMetaTitle,
       showBasicMetaRobots,
       avoidHrefLangsOnCanonicals,
+      avoidSelfReferenceCanonicals,
     } = SettingsService.settings;
 
     NavService.navigations = {
@@ -166,6 +167,7 @@ exports.createPages = async ({ actions }) => {
         useMetaTitle,
         showBasicMetaRobots,
         avoidHrefLangsOnCanonicals,
+        avoidSelfReferenceCanonicals,
       },
       BUILD_MODE,
       siteScript,

package/gatsby-ssr.js

@@ -1,5 +1,4 @@
 /* eslint-disable node/no-missing-require */
-import * as React from 'react';
 const { ssr } = require('components');
 
 export const wrapPageElement = ({ props }) => {
@@ -12,7 +11,7 @@ export const onRenderBody = props => {
   if (ssr.onRenderBody) {
     ssr.onRenderBody(props);
   }
-  
+
   // ** Comentado porque ahora mismo no queremos añadir headers adicionales desde aquí,
   // **   los estamos metiendo en SEO.
   // const { setHeadComponents } = props;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/cx",
   "description": "Griddo SSG based on Gatsby",
-  "version": "1.74.37",
+  "version": "1.75.1",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -65,7 +65,7 @@
     "react-helmet": "^6.0.0"
   },
   "devDependencies": {
-    "@griddo/eslint-config-back": "^1.74.37",
+    "@griddo/eslint-config-back": "^1.75.1",
     "eslint": "^7.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-react": "7.14.3",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "177ea63d2f86cbc0503fa1e26acfe9b93eba6366"
+  "gitHead": "04b271743f982216bd7660874b800831478bcfae"
 }

package/src/components/seo.js

@@ -25,6 +25,7 @@ export default function SEO(props) {
       useMetaTitle,
       showBasicMetaRobots,
       avoidHrefLangsOnCanonicals,
+      avoidSelfReferenceCanonicals,
     },
   } = props;
 
@@ -62,16 +63,20 @@ export default function SEO(props) {
   // else (Cloudinary or unkonwn) returns the original favicon url.
   const faviconResized = addGriddoDamParams(favicon, 'f/png/w/32/h/32');
 
+  // Validate options
+  const useCanonical = !!canonical && !(avoidSelfReferenceCanonicals && canonical === fullUrl);
+  const useHrefLangs = !(avoidHrefLangsOnCanonicals && useCanonical) && index === 'index' && pageLanguages?.length > 1;
+
   return (
     <>
       <Helmet title={title}>
         <meta name="description" content={description} />
         {useMetaTitle && <meta name="title" content={title} />}
-        {canonical && <link rel="canonical" href={canonical} />}
+        {useCanonical && <link rel="canonical" href={canonical} />}
         <link rel="icon" href={faviconResized} />
 
         {/* Alternate, solo si se indexa la página y tiene traducciones */}
-        {!(avoidHrefLangsOnCanonicals && canonical) && index === 'index' && pageLanguages?.length > 1 &&
+        {useHrefLangs &&
           pageLanguages
             .filter(item => item.isLive)
             .map(item => (
@@ -91,16 +96,16 @@ export default function SEO(props) {
         <meta property="og:locale" content={locale} />
         <meta property="og:title" content={openGraph.title || title} />
         <meta property="og:type" content={openGraph.type || 'website'} />
-        <meta property="og:url" content={canonical || fullUrl} />
         <meta property="og:description" content={openGraph.description} />
         <meta property="og:image" content={openGraph.image} />
+        <meta property="og:url" content={canonical || fullUrl} />
 
         {/* Twitter */}
         <meta property="twitter:card" content="summary_large_image" />
-        <meta property="twitter:url" content={canonical || fullUrl} />
         <meta property="twitter:title" content={openGraph.title || title} />
         <meta property="twitter:description" content={openGraph.description} />
         <meta property="twitter:image" content={openGraph.twitterImage} />
+        <meta property="twitter:url" content={canonical || fullUrl} />
 
         {/* Lang */}
         <html lang={locale} />

package/src/utils/helpers.js

@@ -55,11 +55,11 @@ const getPageMetaData = params => {
     || [];
 
   return {
-    title: metaTitle || title,
+    title: (metaTitle || title || '').trim(),
     description: metaDescription,
     canonical:
-      canonicalURL && canonicalURL !== fullUrl
-        ? canonicalURL
+      (canonicalURL && canonicalURL.trim() && canonicalURL !== fullUrl)
+        ? canonicalURL.trim()
         : isIndexed
           ? fullUrl
           : null,

package/src/utils/pages.js

@@ -94,7 +94,7 @@ async function renderSinglePage(page, additionalInfo, createPage) {
 
   if (assetPrefix) mappedPage.matchPath = fullPath.compose;
 
-  createPage(mappedPage);
+  await createPage(mappedPage);
 
   const exportFile = path.resolve(
     __dirname,
@@ -126,7 +126,7 @@ async function renderListPages(
   additionalInfo,
   createPage
 ) {
-  await pages.forEach((dataInPage, idx) => {
+  await pages.forEach(async(dataInPage, idx) => {
     const isFirstPage = idx === 0;
     const pageNumber = idx + 1;
     const { domainUrl, compose } = rootPage.fullPath;
@@ -153,7 +153,7 @@ async function renderListPages(
       isRoot,
       defaultLang,
     };
-    renderSinglePage(paginatedPage, additionalInfo, createPage);
+    await renderSinglePage(paginatedPage, additionalInfo, createPage);
   });
 }