@griddo/cx 1.75.30 → 1.75.33

package/gatsby-node.js

@@ -29,7 +29,10 @@ const BUILD_MODE = process.env.CXBRANCH;
 let updatedSites;
 let createdPages = [];
 let buildProcessData = {};
-const componentsVersion = getComponentsVersion();
+const {
+  componentsVersion,
+  griddoVersion,
+} = getComponentsVersion();
 
 const renderId = process.env.RENDERID || new Date().valueOf();
 
@@ -130,6 +133,7 @@ exports.createPages = async ({ actions }) => {
       showBasicMetaRobots,
       avoidHrefLangsOnCanonicals,
       avoidSelfReferenceCanonicals,
+      avoidDebugMetas,
     } = SettingsService.settings;
 
     NavService.navigations = {
@@ -163,11 +167,13 @@ exports.createPages = async ({ actions }) => {
       siteLangs,
       cloudinaryName,
       componentsVersion,
+      griddoVersion,
       siteOptions: {
         useMetaTitle,
         showBasicMetaRobots,
         avoidHrefLangsOnCanonicals,
         avoidSelfReferenceCanonicals,
+        avoidDebugMetas,
       },
       BUILD_MODE,
       siteScript,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/cx",
   "description": "Griddo SSG based on Gatsby",
-  "version": "1.75.30",
+  "version": "1.75.33",
   "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.75.30",
+    "@griddo/eslint-config-back": "^1.75.33",
     "eslint": "^7.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-react": "7.14.3",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ad429d29a7744df82c699cce4fcb9411f03ad526"
+  "gitHead": "8fd3e9c38978faee9d3860c4f2613423bc59e117"
 }

package/src/components/template.js

@@ -32,6 +32,8 @@ export const Head = ({ pageContext }) => {
     openGraph,
     analyticsDimensions,
     analyticsScript,
+    componentsVersion,
+    griddoVersion,
     page: {
       fullUrl,
     },
@@ -86,6 +88,7 @@ export const Head = ({ pageContext }) => {
       siteOptions?.avoidSelfReferenceCanonicals &&
       pageMetadata?.canonical === fullUrl
     );
+
   const useHrefLangs =
     !(
       siteOptions?.avoidHrefLangsOnCanonicals &&
@@ -97,15 +100,15 @@ export const Head = ({ pageContext }) => {
 
   return (
     <>
-      <title>{pageMetadata?.title}</title>
-      <meta name="description" content={pageMetadata?.description} />
+      {!!pageMetadata?.title && <title>{pageMetadata?.title}</title>}
+      {!!pageMetadata?.description && <meta name="description" content={pageMetadata?.description} />}
       {siteOptions?.useMetaTitle && (
         <meta name="title" content={pageMetadata?.title} />
       )}
-      {siteOptions?.useCanonical && (
+      {useCanonical && (
         <link rel="canonical" href={pageMetadata?.canonical} />
       )}
-      <link rel="icon" href={faviconResized} />
+      {!!faviconResized && <link rel="icon" href={faviconResized} />}
 
       {/* Alternate, solo si se indexa la página y tiene traducciones */}
       {useHrefLangs &&
@@ -121,33 +124,34 @@ export const Head = ({ pageContext }) => {
 
       {/* Robots */}
       {showMetaRobots && (
-        <meta name="robots" content={pageMetadata?.metaRobots} />
+        <meta name="robots" content={metaRobots} />
       )}
 
       {/* Facebook */}
-      <meta property="og:site_name" content={pageMetadata?.title} />
-      <meta property="og:locale" content={locale} />
-      <meta
+      {!!siteMetadata?.title && <meta property="og:site_name" content={siteMetadata?.title} />}
+      {!!locale && <meta property="og:locale" content={locale} />}
+      {(!!openGraph?.title || !!pageMetadata?.title) && <meta
         property="og:title"
         content={openGraph?.title || pageMetadata?.title}
-      />
+      />}
       <meta property="og:type" content={openGraph?.type || 'website'} />
-      <meta property="og:description" content={openGraph?.description} />
-      <meta property="og:image" content={openGraph?.image} />
+      {(!!openGraph?.description || !!pageMetadata?.description) && <meta property="og:description" content={openGraph?.description || pageMetadata?.description} />}
+      {!!openGraph?.image && <meta property="og:image" content={openGraph?.image} />}
       <meta property="og:url" content={pageMetadata?.canonical || fullUrl} />
 
       {/* Twitter */}
       <meta property="twitter:card" content="summary_large_image" />
-      <meta
+      {(!!openGraph?.title || !!pageMetadata?.title) && <meta
         property="twitter:title"
         content={openGraph?.title || pageMetadata?.title}
-      />
-      <meta property="twitter:description" content={openGraph?.description} />
-      <meta property="twitter:image" content={openGraph?.twitterImage} />
+      />}
+      {(!!openGraph?.description || pageMetadata?.description) && <meta property="twitter:description" content={openGraph?.description || pageMetadata?.description} />}
+      {(!!openGraph?.twitterImage || !!openGraph?.image) && <meta property="twitter:image" content={openGraph?.twitterImage || openGraph?.image} />}
       <meta
         property="twitter:url"
         content={pageMetadata?.canonical || fullUrl}
       />
+      {!siteOptions?.avoidDebugMetas && <meta property="debug" content={`Components v${componentsVersion} by Griddo v${griddoVersion} @ ${new Date()}`} />}
 
       {/* Data Layer */}
       {/* Solo cuando se ejecuta en el navegador */}

package/src/utils/package.js

@@ -1,12 +1,18 @@
-const package = require('../../package.json');
+const packageInfo = require('../../package.json');
 
 const getComponentsVersion = () => {
     const {
-        dependencies
-    } = package;
+        dependencies,
+        version,
+    } = packageInfo;
+
     const componentsKey = dependencies.components ? 'components' : Object.keys(dependencies).find(key => key.endsWith('/components'));
-    const version = componentsKey ? dependencies[componentsKey] : '0.0.0';
-    return version.split('^').join('').split('@').slice(-1)[0];
+    const componentsVersion = componentsKey ? dependencies[componentsKey] : '0.0.0';
+
+    return {
+        componentsVersion: componentsVersion.split('^').join('').split('@').slice(-1)[0],
+        griddoVersion: version,
+    };
 };
 
 module.exports = {

package/src/utils/pages.js

@@ -25,6 +25,7 @@ async function renderSinglePage(page, additionalInfo, createPage) {
     cloudinaryName,
     siteOptions,
     componentsVersion,
+    griddoVersion,
     BUILD_MODE,
     sitePages,
     siteScript,
@@ -75,6 +76,7 @@ async function renderSinglePage(page, additionalInfo, createPage) {
       siteOptions,
       BUILD_MODE,
       componentsVersion,
+      griddoVersion,
       sitePages,
       siteScript,