@griddo/cx 1.75.221 → 1.75.223

package/build/index.js

@@ -25,7 +25,7 @@ GFS4: `),console.error(e)});G[Q]||(ta=global[Q]||[],na(G,ta),G.close=function(e)
 \u2502 Access credentials failure                                 \u2502
 \u2502 Check that the login details are correct in your .env file \u2502
 \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F
-`)),process.exit(1)}}},hr=new An;var Xu=Y(On()),Ku=Y(yt()),Qu=Y(Gt());var lp=Y(yt()),Gu=Y(Gt()),fp=Y(tu()),zu=Y(Hu());var Uu="1.75.221";Gu.default.config();var hp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)||!!process.env.LOGS&&!!JSON.parse(process.env.LOGS);function Wu(...e){hp&&console.info(...e)}function Ju(e){return new Promise(t=>setTimeout(t,e))}function ci(e,t=3){return(e/1e3).toFixed(t)}function Vu(e){return"site"in e&&e.site?e?.site:void 0}function ui(...e){let t=performance.now();return e.forEach(r=>r()),ci(performance.now()-t)}function Yu(){let e=`
+`)),process.exit(1)}}},hr=new An;var Xu=Y(On()),Ku=Y(yt()),Qu=Y(Gt());var lp=Y(yt()),Gu=Y(Gt()),fp=Y(tu()),zu=Y(Hu());var Uu="1.75.223";Gu.default.config();var hp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)||!!process.env.LOGS&&!!JSON.parse(process.env.LOGS);function Wu(...e){hp&&console.info(...e)}function Ju(e){return new Promise(t=>setTimeout(t,e))}function ci(e,t=3){return(e/1e3).toFixed(t)}function Vu(e){return"site"in e&&e.site?e?.site:void 0}function ui(...e){let t=performance.now();return e.forEach(r=>r()),ci(performance.now()-t)}function Yu(){let e=`
 \xB7\xB7
 \xB7\xB7
 \xB7\xB7
@@ -41,7 +41,7 @@ GFS4: `),console.error(e)});G[Q]||(ta=global[Q]||[],na(G,ta),G.close=function(e)
 \xB7\xB7
 \xB7\xB7
 \xB7\xB7
-`;console.log(zu.default.cristal(e))}Qu.default.config();var{env:{RETRY_WAIT_SECONDS:dp="4",RETRY_ATTEMPTS:pp="1"}}=process;async function Zu(e){let{endpoint:t,body:r,cached:n,attempt:i=1,method:s,headers:o}=e,a={endpoint:t,body:r,cached:n};if(n){let c=ds(a);if(c)return c}try{let{data:c}=await(0,Xu.default)({url:t,method:s,headers:{...o,...hr.headers},data:r});return hs(a,c),c}catch(c){let d=c;return d.response?.status===404?null:((i>parseInt(pp)||!d.response)&&process.exit(1),mp(d,{callInfo:{endpoint:t,body:r}}),console.warn(`Waiting for retry: ${s}`,t),await Ju(parseInt(dp)*1e3),Zu({endpoint:t,body:r,cached:n,method:s,attempt:i+1}))}}async function el(e){let t=new Date,{endpoint:r}=e,n=await Zu({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",s=Vu(n),o=s?`site: ${s} `:"",a=ci(new Date().getTime()-t.getTime());return Wu(`GET ${i} ${o} ${r} - ${a}s`),n}function mp(e,t){let{response:r,message:n,stack:i}=e,{callInfo:s}=t,{status:o,statusText:a,data:c}=r||{},d=[];for(let m of Object.keys(s)){let w=m;d.push(`${m}: ${typeof s[w]=="object"?JSON.stringify(s[w]):s[w]}`)}let h=d.join(`
+`;console.log(zu.default.cristal(e))}Qu.default.config();var{env:{RETRY_WAIT_SECONDS:dp="4",RETRY_ATTEMPTS:pp="1"}}=process;async function Zu(e){let{endpoint:t,body:r,cached:n,attempt:i=1,method:s,headers:o}=e,a={endpoint:t,body:r,headers:o,cached:n};if(n){let c=ds(a);if(c)return c}try{let{data:c}=await(0,Xu.default)({url:t,method:s,headers:{...o,...hr.headers},data:r});return hs(a,c),c}catch(c){let d=c;return d.response?.status===404?null:((i>parseInt(pp)||!d.response)&&process.exit(1),mp(d,{callInfo:{endpoint:t,body:r}}),console.warn(`Waiting for retry: ${s}`,t),await Ju(parseInt(dp)*1e3),Zu({endpoint:t,body:r,cached:n,method:s,attempt:i+1}))}}async function el(e){let t=new Date,{endpoint:r}=e,n=await Zu({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",s=Vu(n),o=s?`site: ${s} `:"",a=ci(new Date().getTime()-t.getTime());return Wu(`GET ${i} ${o} ${r} - ${a}s`),n}function mp(e,t){let{response:r,message:n,stack:i}=e,{callInfo:s}=t,{status:o,statusText:a,data:c}=r||{},d=[];for(let m of Object.keys(s)){let w=m;d.push(`${m}: ${typeof s[w]=="object"?JSON.stringify(s[w]):s[w]}`)}let h=d.join(`
 `),p=r?`Code: ${o} - ${a}
 Response: ${JSON.stringify(c)}`:"",y=`${n}
 ${i}`;console.warn(Ku.default.bold.red(`

package/build/reset-render.js

@@ -23,7 +23,7 @@ GFS4: `),console.error(e)});H[K]||(ys=global[K]||[],vs(H,ys),H.close=function(e)
 \u2502 Access credentials failure                                 \u2502
 \u2502 Check that the login details are correct in your .env file \u2502
 \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F
-`)),process.exit(1)}}},Zt=new an;var ac=ye(en()),uc=ye(Qt()),cc=ye(cn());var ns=ye(require("crypto")),ln=ye(require("fs")),is=ye(require("path")),os=is.default.resolve(__dirname,"./../../apiCache"),cp=`${os}/siteHash.json`;function ss(e){let t=ns.default.createHash("sha256");return t.update(JSON.stringify(e)),`${os}/${t.digest("hex")}`}function as(e,t){let r=typeof t=="string"?t:JSON.stringify(t);ln.default.writeFileSync(ss(e),r,"utf8")}function us(e){try{let t=ln.default.readFileSync(ss(e),{encoding:"utf-8"});return JSON.parse(t)}catch{return null}}var od=ye(Qt()),ic=ye(cn()),sd=ye(yu()),ad=ye(nc());ic.default.config();var ud=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)||!!process.env.LOGS&&!!JSON.parse(process.env.LOGS);function Un(...e){ud&&console.info(...e)}function oc(e){return new Promise(t=>setTimeout(t,e))}function Gn(e,t=3){return(e/1e3).toFixed(t)}function sc(e){return"site"in e&&e.site?e?.site:void 0}cc.default.config();var{env:{RETRY_WAIT_SECONDS:cd="4",RETRY_ATTEMPTS:ld="1"}}=process;async function zn(e){let{endpoint:t,body:r,cached:n,attempt:i=1,method:o,headers:s}=e,a={endpoint:t,body:r,cached:n};if(n){let u=us(a);if(u)return u}try{let{data:u}=await(0,ac.default)({url:t,method:o,headers:{...s,...Zt.headers},data:r});return as(a,u),u}catch(u){let d=u;return d.response?.status===404?null:((i>parseInt(ld)||!d.response)&&process.exit(1),fd(d,{callInfo:{endpoint:t,body:r}}),console.warn(`Waiting for retry: ${o}`,t),await oc(parseInt(cd)*1e3),zn({endpoint:t,body:r,cached:n,method:o,attempt:i+1}))}}async function lc(e){let t=new Date,{endpoint:r}=e,n=await zn({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",o=sc(n),s=o?`site: ${o} `:"",a=Gn(new Date().getTime()-t.getTime());return Un(`GET ${i} ${s} ${r} - ${a}s`),n}async function fc(e){let t=new Date,{endpoint:r,body:n,headers:i}=e,o=r.endsWith("/distributor")?`# Distributor body: ${JSON.stringify(n)} - lang: ${JSON.stringify(i?.lang)}`:"",s=await zn({...e,method:"post"}),a=e.cached?"(cached)":"(fetch)",u=Gn(new Date().getTime()-t.getTime());return Un(`POST ${a} ${r} - ${u}s ${o}`),s}function fd(e,t){let{response:r,message:n,stack:i}=e,{callInfo:o}=t,{status:s,statusText:a,data:u}=r||{},d=[];for(let m of Object.keys(o)){let _=m;d.push(`${m}: ${typeof o[_]=="object"?JSON.stringify(o[_]):o[_]}`)}let h=d.join(`
+`)),process.exit(1)}}},Zt=new an;var ac=ye(en()),uc=ye(Qt()),cc=ye(cn());var ns=ye(require("crypto")),ln=ye(require("fs")),is=ye(require("path")),os=is.default.resolve(__dirname,"./../../apiCache"),cp=`${os}/siteHash.json`;function ss(e){let t=ns.default.createHash("sha256");return t.update(JSON.stringify(e)),`${os}/${t.digest("hex")}`}function as(e,t){let r=typeof t=="string"?t:JSON.stringify(t);ln.default.writeFileSync(ss(e),r,"utf8")}function us(e){try{let t=ln.default.readFileSync(ss(e),{encoding:"utf-8"});return JSON.parse(t)}catch{return null}}var od=ye(Qt()),ic=ye(cn()),sd=ye(yu()),ad=ye(nc());ic.default.config();var ud=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)||!!process.env.LOGS&&!!JSON.parse(process.env.LOGS);function Un(...e){ud&&console.info(...e)}function oc(e){return new Promise(t=>setTimeout(t,e))}function Gn(e,t=3){return(e/1e3).toFixed(t)}function sc(e){return"site"in e&&e.site?e?.site:void 0}cc.default.config();var{env:{RETRY_WAIT_SECONDS:cd="4",RETRY_ATTEMPTS:ld="1"}}=process;async function zn(e){let{endpoint:t,body:r,cached:n,attempt:i=1,method:o,headers:s}=e,a={endpoint:t,body:r,headers:s,cached:n};if(n){let u=us(a);if(u)return u}try{let{data:u}=await(0,ac.default)({url:t,method:o,headers:{...s,...Zt.headers},data:r});return as(a,u),u}catch(u){let d=u;return d.response?.status===404?null:((i>parseInt(ld)||!d.response)&&process.exit(1),fd(d,{callInfo:{endpoint:t,body:r}}),console.warn(`Waiting for retry: ${o}`,t),await oc(parseInt(cd)*1e3),zn({endpoint:t,body:r,cached:n,method:o,attempt:i+1}))}}async function lc(e){let t=new Date,{endpoint:r}=e,n=await zn({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",o=sc(n),s=o?`site: ${o} `:"",a=Gn(new Date().getTime()-t.getTime());return Un(`GET ${i} ${s} ${r} - ${a}s`),n}async function fc(e){let t=new Date,{endpoint:r,body:n,headers:i}=e,o=r.endsWith("/distributor")?`# Distributor body: ${JSON.stringify(n)} - lang: ${JSON.stringify(i?.lang)}`:"",s=await zn({...e,method:"post"}),a=e.cached?"(cached)":"(fetch)",u=Gn(new Date().getTime()-t.getTime());return Un(`POST ${a} ${r} - ${u}s ${o}`),s}function fd(e,t){let{response:r,message:n,stack:i}=e,{callInfo:o}=t,{status:s,statusText:a,data:u}=r||{},d=[];for(let m of Object.keys(o)){let _=m;d.push(`${m}: ${typeof o[_]=="object"?JSON.stringify(o[_]):o[_]}`)}let h=d.join(`
 `),p=r?`Code: ${s} - ${a}
 Response: ${JSON.stringify(u)}`:"",y=`${n}
 ${i}`;console.warn(uc.default.bold.red(`

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.221",
+	"version": "1.75.223",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -35,7 +35,6 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^1.75.221",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-styled-components": "^1.10.7",
@@ -65,7 +64,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.221",
+		"@griddo/eslint-config-back": "^1.75.223",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -113,5 +112,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "b8a0de5fd919a1e6a245c0119f30dbf7d468c233"
+	"gitHead": "063dd7fbf1bdcb470d8c9d35accb6fea54464e54"
 }

package/src/components/Head.tsx

@@ -15,6 +15,7 @@ const Head = (props: CustomHeadProps) => {
 	const {
 		pageContext: {
 			griddoVersion,
+			renderDate,
 			locale,
 			openGraph,
 			page: { disableHrefLangs, fullUrl, defaultLang },
@@ -104,8 +105,6 @@ const Head = (props: CustomHeadProps) => {
 				?.url) ||
 		null;
 
-	const currentTime = new Date().toString();
-
 	return (
 		<>
 			{/* Uncomment with Gatsby 5.5.0 */}
@@ -174,7 +173,7 @@ const Head = (props: CustomHeadProps) => {
 			{!siteOptions?.avoidDebugMetas && (
 				<meta
 					property="debug"
-					content={`Griddo v${griddoVersion} @ ${currentTime}}`}
+					content={`Griddo v${griddoVersion} @ ${renderDate}}`}
 				/>
 			)}
 

package/src/services/distributors.ts

@@ -112,10 +112,10 @@ class DistributorService {
 	 */
 	static async getDistributorData({
 		page,
-		cached = false,
+		cached = "",
 	}: {
 		page: APIPageObject;
-		cached: boolean;
+		cached: string;
 	}) {
 		try {
 			const { template } = page;

package/src/services/sites.ts

@@ -129,7 +129,7 @@ class SitesService {
 	static async getDistributorData(
 		page: Core.Page,
 		body: DistributorBody,
-		cached: boolean
+		cached: string
 	) {
 		const {
 			GET_DISTRIBUTOR_DATA: [prefix, suffix],

package/src/services/store.ts

@@ -280,7 +280,7 @@ class StoreService {
 					// for the data.
 					const template = await DistributorService.getDistributorData({
 						page,
-						cached: !!RENDER_ID,
+						cached: RENDER_ID,
 					});
 
 					// MultiPage Query

package/src/types/global.ts

@@ -50,7 +50,7 @@ export interface FetchDataProps {
 	component: {
 		data: Fields.Reference<unknown>;
 	};
-	cached: boolean;
+	cached: string;
 }
 
 // TODO: JSDoc

package/src/types/pages.ts

@@ -108,6 +108,7 @@ export type GatsbyPageObject = {
 		footer: Record<string, unknown> | null;
 		fullPath: Core.Page["fullPath"];
 		griddoVersion: string;
+		renderDate: string;
 		header: Record<string, unknown> | null;
 		id?: number;
 		languageId: number;

package/src/utils/api.ts

@@ -39,7 +39,7 @@ async function requestAPI<T extends APIResponses>(
 	props: APIRequest & { method: Method }
 ): Promise<T> {
 	const { endpoint, body, cached, attempt = 1, method, headers } = props;
-	const cacheOptions = { endpoint, body, cached };
+	const cacheOptions = { endpoint, body, headers, cached };
 
 	// Cache
 	if (cached) {

package/src/utils/pages.ts

@@ -164,10 +164,11 @@ async function createGatsbyPageObject(
 		socialTitle,
 	});
 
-	const pagePath =
-		NEEDS_ASSET_PREFIX || STRIP_DOMAIN_FROM_PATH
-			? fullPath.compose
-			: `${fullPath?.domain}${fullPath?.compose}`;
+	const pagePath = STRIP_DOMAIN_FROM_PATH
+		? fullPath.compose
+		: `${fullPath.domain}${fullPath.compose}`;
+
+	const renderDate = new Date().toString();
 
 	const pageObjectForGatsby: GatsbyPageObject = {
 		path: pagePath,
@@ -193,6 +194,7 @@ async function createGatsbyPageObject(
 			siteOptions,
 			BUILD_MODE,
 			griddoVersion,
+			renderDate,
 			siteScript,
 
 			// Navigation sections

package/src/utils/sites.ts

@@ -31,6 +31,9 @@ const GRIDDO_RENDER_PAGES = (
 	.map((item) => parseInt(item))
 	.filter(Boolean);
 
+const STRIP_DOMAIN_FROM_PATH =
+	!!process.env.GRIDDO_EXPORT_STRIP_DOMAIN_FROM_PATH;
+
 /**
  * Check the instance sites and returns site prepared to be published and unpublished.
  */
@@ -232,7 +235,9 @@ async function generateSitemaps(sites: Array<Site>) {
 
 			const sitemapBasePath = path.resolve(
 				__dirname,
-				`../../public/${slug.replace(domain, "")}`
+				`../../public/${
+					STRIP_DOMAIN_FROM_PATH ? slug.replace(domain, "") : slug
+				}`
 			);
 
 			for (const templateId of sitemapPageGroupKeys) {