@griddo/cx 1.72.9 → 1.73.0

package/gatsby-node.js

@@ -7,7 +7,7 @@ const NavigationService = require('./src/services/navigation').default;
 const SitesService = require('./src/services/sites').default;
 const SettingsService = require('./src/services/settings').default;
 const RobotsService = require('./src/services/robots').default;
-const { initCache } = require('./src/utils/cache');
+const { initCache, updatedSiteHash } = require('./src/utils/cache');
 
 const {
   isComponentLibraryEnv,
@@ -103,11 +103,8 @@ exports.onPreInit = async () => {
 exports.createPages = async ({ actions }) => {
   // fetch
   for (const site of updatedSites) {
-    const cache = !site.shouldBeUpdated;
     const NavService = new NavigationService();
-
-    const { id: siteID, slug: siteSlug, theme, favicon } = site;
-
+    const { id: siteId, slug: siteSlug, theme, favicon } = site;
     const {
       siteInfo,
       validPagesIds,
@@ -118,7 +115,9 @@ exports.createPages = async ({ actions }) => {
       headers,
       footers,
       socials,
-    } = await sites.getSiteData(siteID);
+    } = await sites.getSiteData(siteId);
+
+    const cache = updatedSiteHash(siteId, siteHash);
 
     site.languages = siteLangs;
 
@@ -133,7 +132,7 @@ exports.createPages = async ({ actions }) => {
       footers,
     };
 
-    buildProcessData[siteID] = {
+    buildProcessData[siteId] = {
       siteHash,
       unpublishHashes,
       publishHashes: [],
@@ -219,7 +218,7 @@ exports.createPages = async ({ actions }) => {
             actions.createPage
           );
 
-      buildProcessData[siteID].publishHashes.push(page.hash);
+      buildProcessData[siteId].publishHashes.push(page.hash);
     }
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/cx",
   "description": "Griddo SSG based on Gatsby",
-  "version": "1.72.9",
+  "version": "1.73.0",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -53,19 +53,19 @@
     "gatsby-plugin-react-helmet": "^5.8.0",
     "gatsby-plugin-react-svg": "^3.1.0",
     "gatsby-plugin-remove-generator": "^1.2.0",
-    "gatsby-plugin-sass": "^5.8.0",
+    "gatsby-plugin-sass": "^5.21.0",
     "gatsby-plugin-styled-components": "^5.8.0",
     "html-react-parser": "^1.4.10",
     "js2xmlparser": "^4.0.1",
-    "node-sass": "^7.0.1",
     "opn": "^6.0.0",
     "path-browserify": "^1.0.1",
     "pkg-dir": "^5.0.0",
     "process": "^0.11.10",
-    "react-helmet": "^6.0.0"
+    "react-helmet": "^6.0.0",
+    "sass": "^1.54.5"
   },
   "devDependencies": {
-    "@griddo/eslint-config-back": "^1.72.9",
+    "@griddo/eslint-config-back": "^1.73.0",
     "eslint": "^7.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-react": "7.14.3",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "396779b881366e8c42f01146bf2f276eff5aba77"
+  "gitHead": "39770a163c7efb63faf94e9ba72e3d1d866dca18"
 }

package/src/api/index.js

@@ -5,7 +5,7 @@ const { saveCache, getCache } = require('../utils/cache');
 require("dotenv").config()
 
 const getApi = async (endpoint, body, cached = false) => {
-  const cacheOptions = { endpoint, body };
+  const cacheOptions = { endpoint, body, cached };
   if (cached) {
     const cachedResponse = getCache(cacheOptions);
     if (cachedResponse) return cachedResponse;

package/src/components/template.js

@@ -1,18 +1,13 @@
 /* eslint-disable node/no-extraneous-import */
-import * as React from 'react';
-import { Link, navigate } from 'gatsby';
-import Seo from './seo';
-import { composeAnalytics } from '../utils/dataLayer';
-import {
-  generateAutomaticDimensions,
-  components,
-  templates,
-  SiteProvider,
-} from 'components';
+import * as React from "react";
+import { Link, navigate } from "gatsby";
+import Seo from "./seo";
+import { composeAnalytics } from "../utils/dataLayer";
+import { generateAutomaticDimensions, components, templates, SiteProvider } from "components";
 
-import { Page as RenderGriddoPage } from '@griddo/core';
+import { Page as RenderGriddoPage } from "@griddo/core";
 
-export default data => {
+export default (data) => {
   const {
     page: content,
     locale,
@@ -37,12 +32,9 @@ export default data => {
     templates,
   };
 
-  const mappedTheme = theme || 'default-theme';
+  const mappedTheme = theme || "default-theme";
 
-  const { analyticsScript, analyticsDimensions } = composeAnalytics(
-    data,
-    generateAutomaticDimensions
-  );
+  const { analyticsScript, analyticsDimensions } = composeAnalytics(data, generateAutomaticDimensions);
 
   if (!content.dimensions) content.dimensions = [];
   content.dimensions.values = analyticsDimensions;

package/src/utils/cache.js

@@ -4,6 +4,7 @@ const crypto = require('crypto');
 
 const apiCacheDirectory = './apiCache';
 const gatsbyCacheDirectory = path.resolve(__dirname, './../../.cache');
+const siteHashFilename = `${apiCacheDirectory}/siteHash.json`;
 
 const initCache = () => {
   // TODO: Make a domain-based cache to store and restore
@@ -39,8 +40,31 @@ const getCache = petition => {
   }
 };
 
+const getHashSites = () => {
+  try {
+    return JSON.parse(fs.readFileSync(siteHashFilename)) || {};
+  } catch {
+    return {};
+  }
+};
+
+const updatedSiteHash = (siteId, siteHash) => {
+  const allHash = getHashSites();
+
+  const lastHash = allHash[siteId];
+  const currentHash = siteHash || lastHash || new Date().valueOf();
+
+  if (currentHash !== lastHash) {
+    allHash[siteId] = currentHash;
+    fs.writeFileSync(siteHashFilename, JSON.stringify(allHash), 'utf8');
+  }
+
+  return currentHash;
+};
+
 module.exports = {
   initCache,
   saveCache,
   getCache,
+  updatedSiteHash,
 };

package/static/robots.txt

@@ -1 +1,2 @@
 User-agent: *
+Disallow: /