@griddo/cx 1.62.2 → 1.62.5

package/gatsby-browser.js

@@ -1,153 +1,111 @@
-/* eslint-disable node/no-unpublished-require */
 /* eslint-disable node/no-missing-require */
 
-let builderBrowserConfig;
-
-// Intance Gatsby Browser configuration file
-// Se intenta hacer require del archivo builder.config que solo está en la
-// instancia. De no existir, se avisa por consola.
-// TODO: Añadir un método infalible para saber si es monorepo o instancia.
-try {
-  builderBrowserConfig = require('../../../builder.browser');
-  console.log('Instance build.config loaded');
-} catch (e) {
-  builderBrowserConfig = require('../griddo-components/builder.browser');
-  console.warn('Loading builder.config from Griddo monorepo');
-}
-
-// Gatsby API Browser
-// Si builderBrowserConfig.* es "truthy" es que `builderBrowserConfig` no es `undefined`, es decir se
-// está ejecutando en la instancia y * está definido en el archivo de la
-// instancia para ejecutar código.
+const { browser } = require('components');
 
 exports.disableCorePrefetching = () => {
-  if (builderBrowserConfig.disableCorePrefetching) {
-    builderBrowserConfig.disableCorePrefetching();
+  if (browser.disableCorePrefetching) {
+    browser.disableCorePrefetching();
   }
 };
 
 exports.onClientEntry = () => {
-  if (builderBrowserConfig.onClientEntry) {
-    builderBrowserConfig.onClientEntry();
+  if (browser.onClientEntry) {
+    browser.onClientEntry();
   }
 };
 
 exports.onInitialClientRender = () => {
-  if (builderBrowserConfig.onInitialClientRender) {
-    builderBrowserConfig.onInitialClientRender();
+  if (browser.onInitialClientRender) {
+    browser.onInitialClientRender();
   }
 };
 
 exports.onPostPrefetchPathname = props => {
-  if (builderBrowserConfig.onPostPrefetchPathname) {
-    builderBrowserConfig.onPostPrefetchPathname(props);
+  if (browser.onPostPrefetchPathname) {
+    browser.onPostPrefetchPathname(props);
   }
 };
 
 exports.onPreRouteUpdate = props => {
-  if (builderBrowserConfig.onPreRouteUpdate) {
-    builderBrowserConfig.onPreRouteUpdate(props);
+  if (browser.onPreRouteUpdate) {
+    browser.onPreRouteUpdate(props);
   }
 };
 
 exports.onPrefetchPathname = props => {
-  if (builderBrowserConfig.onPrefetchPathname) {
-    builderBrowserConfig.onPrefetchPathname(props);
+  if (browser.onPrefetchPathname) {
+    browser.onPrefetchPathname(props);
   }
 };
 
 exports.onRouteUpdateDelayed = props => {
-  if (builderBrowserConfig.onServiceWorkerActive) {
-    builderBrowserConfig.onRouteUpdateDelayed(props);
+  if (browser.onServiceWorkerActive) {
+    browser.onRouteUpdateDelayed(props);
   }
 };
 
 exports.onServiceWorkerActive = props => {
-  if (builderBrowserConfig.onServiceWorkerActive) {
-    builderBrowserConfig.onServiceWorkerActive(props);
+  if (browser.onServiceWorkerActive) {
+    browser.onServiceWorkerActive(props);
   }
 };
 
 exports.onServiceWorkerInstalled = props => {
-  if (builderBrowserConfig.onServiceWorkerInstalled) {
-    builderBrowserConfig.onServiceWorkerInstalled(props);
+  if (browser.onServiceWorkerInstalled) {
+    browser.onServiceWorkerInstalled(props);
   }
 };
 
 exports.onServiceWorkerRedundant = props => {
-  if (builderBrowserConfig.onServiceWorkerRedundant) {
-    builderBrowserConfig.onServiceWorkerRedundant(props);
+  if (browser.onServiceWorkerRedundant) {
+    browser.onServiceWorkerRedundant(props);
   }
 };
 
 exports.onServiceWorkerUpdateFound = props => {
-  if (builderBrowserConfig.onServiceWorkerUpdateFound) {
-    builderBrowserConfig.onServiceWorkerUpdateFound(props);
+  if (browser.onServiceWorkerUpdateFound) {
+    browser.onServiceWorkerUpdateFound(props);
   }
 };
 
 exports.onServiceWorkerUpdateReady = props => {
-  if (builderBrowserConfig.onServiceWorkerUpdateReady) {
-    builderBrowserConfig.onServiceWorkerUpdateReady(props);
+  if (browser.onServiceWorkerUpdateReady) {
+    browser.onServiceWorkerUpdateReady(props);
   }
 };
 
 exports.registerServiceWorker = () => {
-  if (builderBrowserConfig.registerServiceWorker) {
-    builderBrowserConfig.registerServiceWorker();
+  if (browser.registerServiceWorker) {
+    browser.registerServiceWorker();
   }
 };
 
 exports.replaceHydrateFunction = () => {
-  if (builderBrowserConfig.replaceHydrateFunction) {
-    builderBrowserConfig.replaceHydrateFunction();
+  if (browser.replaceHydrateFunction) {
+    browser.replaceHydrateFunction();
   }
 };
 
 exports.shouldUpdateScroll = props => {
-  if (builderBrowserConfig.shouldUpdateScroll) {
-    builderBrowserConfig.shouldUpdateScroll(props);
+  if (browser.shouldUpdateScroll) {
+    browser.shouldUpdateScroll(props);
   }
 };
 
 exports.wrapRootElement = props => {
-  if (builderBrowserConfig.wrapPageElement) {
-    return builderBrowserConfig.wrapRootElement(props);
+  if (browser.wrapPageElement) {
+    return browser.wrapRootElement(props);
   }
 };
 
 exports.wrapRootElement = props => {
-  if (builderBrowserConfig.wrapRootElement) {
-    return builderBrowserConfig.wrapRootElement(props);
+  if (browser.wrapRootElement) {
+    return browser.wrapRootElement(props);
   }
 };
 
 exports.onRouteUpdate = props => {
-  // Instance onRouteUpdate
-  if (builderBrowserConfig.onRouteUpdate) {
-    builderBrowserConfig.onRouteUpdate(props);
-  }
-
-  // Griddo onRouteUpdate
-  if (!window || !document || !location || !location.hash) return;
-
-  const headerHeight =
-    document.querySelector('.griddo-header')?.offsetHeight || 0;
-  if (location.hash !== '') {
-    window.scrollTo({
-      left: 0,
-      top: getOffset(location.hash).top - headerHeight,
-      behavior: 'smooth',
-    });
+  if (browser.onRouteUpdate) {
+    browser.onRouteUpdate(props);
   }
 };
-
-// Functions
-
-function getOffset(el) {
-  const rect = document?.querySelector(el)?.getBoundingClientRect();
-  return {
-    left: rect?.left + window?.scrollX,
-    top: rect?.top + window?.scrollY,
-  };
-}

package/gatsby-config.js

@@ -4,13 +4,14 @@ require('dotenv').config();
 
 const assetPrefix = process.env.ASSET_PREFIX || undefined;
 
-// Gatsby plugins configuration file from client
-// TODO: Filter the configuration to allow just supported plugins?
-const { plugins } = require(computils.resolveComponentsPath(
+// Gatsby configuration file from client
+const { plugins, ...gatsbyConfig } = require(computils.resolveComponentsPath(
   'builder.config.js'
 ));
 
 const CONFIG = {
+  // cliente config
+  ...gatsbyConfig,
   plugins: [
     // client plugins
     ...plugins,

package/gatsby-ssr.js

@@ -1,50 +1,33 @@
-/* eslint-disable node/no-unpublished-require */
 /* eslint-disable node/no-missing-require */
 
-let builderSSRConfig;
+const { ssr } = require('components');
 
-// Intance Gatsby Browser configuration file
-// Se intenta hacer require del archivo builder.config que solo está en la
-// instancia. De no existir, se avisa por consola.
-// TODO: Añadir un método infalible para saber si es monorepo o instancia.
-try {
-  builderSSRConfig = require('../../../builder.ssr');
-  console.log('Instance build.ssr loaded');
-} catch (e) {
-  builderSSRConfig = require('../griddo-components/builder.ssr');
-  console.warn('Loading builder.ssr from Griddo monorepo');
-}
-
-// Gatsby SSR Browser
-// Si builderSSRConfig.* es "truthy" es que `builderSSRConfig` no es `undefined`, es decir se
-// está ejecutando en la instancia y * está definido en el archivo de la
-// instancia para ejecutar código.
 exports.onRenderBody = props => {
-  if (builderSSRConfig.onRenderBody) {
-    builderSSRConfig.onRenderBody(props);
+  if (ssr.onRenderBody) {
+    ssr.onRenderBody(props);
   }
 };
 
 exports.onPreRenderHTML = props => {
-  if (builderSSRConfig.onPreRenderHTML) {
-    builderSSRConfig.onPreRenderHTML(props);
+  if (ssr.onPreRenderHTML) {
+    ssr.onPreRenderHTML(props);
   }
 };
 
 exports.replaceRenderer = props => {
-  if (builderSSRConfig.replaceRenderer) {
-    builderSSRConfig.replaceRenderer(props);
+  if (ssr.replaceRenderer) {
+    ssr.replaceRenderer(props);
   }
 };
 
 exports.wrapPageElement = props => {
-  if (builderSSRConfig.wrapPageElement) {
-    return builderSSRConfig.wrapPageElement(props);
+  if (ssr.wrapPageElement) {
+    return ssr.wrapPageElement(props);
   }
 };
 
 exports.wrapRootElement = props => {
-  if (builderSSRConfig.wrapRootElement) {
-    return builderSSRConfig.wrapRootElement(props);
+  if (ssr.wrapRootElement) {
+    return ssr.wrapRootElement(props);
   }
 };

package/package.json

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