@griddo/cx 10.4.30 → 10.4.32

package/exporter/adapters/gatsby/index.ts

@@ -6,6 +6,8 @@ import {
 	legacy__createDistFromGatsbyPublic,
 	runGatsbyBuildCommand,
 } from "./utils";
+import { throwError } from "../../errors";
+import { NoDomainsFoundError, RenderUUIDError } from "../../errors/errors-data";
 import { RobotsService } from "../../services/robots";
 import {
 	attempts,
@@ -37,7 +39,11 @@ async function runGatsbyAdapter() {
 
 	fs.writeFileSync(renderSentinelFile, new Date().toISOString());
 
-	const domains = await getInstanceDomains();
+	const domains: Array<string> = await getInstanceDomains();
+
+	if (!domains.length) {
+		throwError(NoDomainsFoundError);
+	}
 
 	for (const domain of domains) {
 		const { __ssg, __exports, __caches, __cx, __components } = config.paths(
@@ -252,14 +258,7 @@ async function runGatsbyAdapter() {
 			steps: [
 				() => {
 					if (!fs.existsSync(renderSentinelFile)) {
-						logBox(
-							`Something has happened and the rendering uuid cannot be read safely.
-There was probably a instance deployment during the render and files were deleted.
-
-The files generated in this render will not be published.`,
-							"Render UUID error"
-						);
-						throw new Error("Render sentinel file does not exist.");
+						throwError(RenderUUIDError);
 					}
 				},
 			],

package/exporter/adapters/gatsby/utils.ts

@@ -156,21 +156,24 @@ async function legacy__createDistFromGatsbyPublic(
 
 	try {
 		fsx.mkdirSync(cxAssetsDir, { recursive: true });
-		fsx.copySync(publicDir, cxDistDir);
+		fsx.copySync(publicDir, cxDistDir, { preserveTimestamps: true });
 
 		if (needsAssetPrefix) {
-			fsx.copySync(pageDataSrc, pageDataDest);
+			fsx.copySync(pageDataSrc, pageDataDest, { preserveTimestamps: true });
 			if (fsx.existsSync(projectStaticSrc)) {
 				fsx.copySync(projectStaticSrc, projectStaticDest, {
 					overwrite: false,
+					preserveTimestamps: true,
 				});
 			}
 			fsx.copySync(gatsbyStaticSrc, gatsbyStaticDest, {
 				overwrite: false,
+				preserveTimestamps: true,
 			});
 			if (fsx.existsSync(projectStaticSrc)) {
 				fsx.copySync(projectStaticSrc, cxDistDirWithDomain, {
 					overwrite: false,
+					preserveTimestamps: true,
 				});
 			}
 
@@ -178,7 +181,7 @@ async function legacy__createDistFromGatsbyPublic(
 			validFilesFromPublic.map(async (file) => {
 				const fileSrc = `${publicDir}/${file}`;
 				const fileDest = `${cxAssetsDir}/${file}`;
-				fsx.copySync(fileSrc, fileDest);
+				fsx.copySync(fileSrc, fileDest, { preserveTimestamps: true });
 			});
 		}
 	} catch (err) {

package/exporter/errors/errors-data.ts

@@ -0,0 +1,42 @@
+/**
+ * Do you want to add a new error to the list?
+ *
+ * 1 - Add the new error type name to the `ErrorsType` union type.
+ * 2 - Export a new ErrorData object in this file by completing
+ * the `error` and `message` properties obligatorily.
+ *
+ */
+
+import { ErrorData } from ".";
+
+export type ErrorsType =
+	| "NoDomainsFoundError"
+	| "RenderUUIDError"
+	| "DistributorSourcesNotFoundError";
+
+export const NoDomainsFoundError: ErrorData = {
+	id: 100,
+	error: "NoDomainsFoundError",
+	message: "No domains found in this instance. The process cannot continue.",
+	expected:
+		"This can happen if the API is not functioning or the site is not properly configured, or the domains are not registered.",
+	hint: "You can contact the instance administrator.",
+};
+
+export const RenderUUIDError: ErrorData = {
+	id: 101,
+	error: "RenderUUIDError",
+	message: `Render sentinel file does not exist.
+The rendering uuid cannot be read safely.
+There was probably a instance deployment during the render and files were deleted.
+
+The files generated in this render will not be published.`,
+};
+
+export const DistributorSourcesNotFoundError: ErrorData = {
+	id: 102,
+	error: "DistributorSourcesNotFoundError",
+	message: "El distribuidor no tiene souces definidos.",
+	expected:
+		"Se espera que al menos tenga un fuente de datos en la propiedad `sources`, aunque esté vacía.",
+};

package/exporter/errors/index.ts

@@ -1,2 +1,31 @@
-// noop
-export const noop = true;
+import type { ErrorsType } from "./errors-data";
+
+import { logBox } from "../utils/core-utils";
+
+export type ErrorData = {
+	id: number;
+	error: ErrorsType;
+	message: string;
+	expected?: string;
+	hint?: string;
+};
+
+class RenderError extends Error {
+	constructor() {
+		super();
+		this.name = "InternalCXError";
+		this.stack = "";
+	}
+}
+
+/**
+ * Throws an error with the provided error message, expected value, and hint.
+ */
+function throwError({ error, message, expected = "", hint = "" }: ErrorData) {
+	const errorMessage = [message, expected, hint].filter(Boolean).join("\n");
+
+	logBox(errorMessage, error, 1, 0);
+	throw new RenderError();
+}
+
+export { throwError };

package/exporter/react/GriddoIntegrations/index.tsx

@@ -11,12 +11,21 @@ import {
 	filterHeadIntegrations,
 } from "../../utils/integrations";
 
+
 export interface GriddoIntegrationsProps {
 	integrations?: Array<Core.PageIntegration>;
 	location: "head" | "start-body" | "end-body";
 	id?: string;
 	analyticScript?: string;
 	dimensions?: Dimensions;
+	pageInfo: {
+		pageContext: {
+			siteScript: string;
+			page: {
+				dimensions: Dimensions;
+			};
+		};
+	};
 }
 
 function GriddoIntegrations(props: GriddoIntegrationsProps) {
@@ -26,6 +35,7 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 		id,
 		analyticScript: siteScript,
 		dimensions,
+		pageInfo
 	} = props;
 
 	const integrations = maybeIntegrations || [];
@@ -37,7 +47,7 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 		"end-body": filterBodyIntegrationFromPosition(integrations, "end"),
 	};
 
-	const ints = integrationsGroupedBy[location];
+	const integrationsOrdered = integrationsGroupedBy[location];
 
 	// Analytics GTM + Dimensions
 	const emptyCodeScript = { props: { dangerouslySetInnerHTML: {} } };
@@ -45,6 +55,7 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 	const { analyticsScript, analyticsDimensions } = composeAnalytics(
 		siteScript,
 		dimensions,
+		pageInfo,
 		generateAutomaticDimensions,
 	);
 
@@ -87,7 +98,7 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 
 	return (
 		<>
-			{ints?.map((integration, key) => {
+			{integrationsOrdered?.map((integration, key) => {
 				/* Data Layer */
 				if (integration.type === "datalayer") {
 					return (
@@ -119,7 +130,11 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 
 				/* Integration integration.type === "addon" */
 				if (integration.type === "addon") {
-					return parse(integration.content, { trim: true });
+					return (
+						<React.Fragment key={key}>
+							{parse(integration.content, { trim: true })}
+						</React.Fragment>
+					);
 				}
 
 				return null;

package/exporter/services/distributors.ts

@@ -46,11 +46,7 @@ class DistributorService {
 		}
 
 		if (mode === "manual") {
-			return {
-				mode,
-				fixed,
-				fullRelations,
-			};
+			return { mode, fixed, fullRelations };
 		}
 
 		if (mode === "navigation") {
@@ -107,7 +103,17 @@ class DistributorService {
 		}
 
 		const { site, lang } = data;
+
+		// Infor that the distributor has not dat.sources
+		if (!data.sources) {
+			logBox(
+				`Warning: Page with id: ${page.id} in the site ${site} has a ReferenceField with \`undefined\` \`data.sources\``,
+				"Undefined data.sources in ReferenceField"
+			);
+		}
+
 		const body = this.getBody(data, page);
+
 		const response = await SitesService.getDistributorData(
 			page,
 			body,

package/exporter/services/store.ts

@@ -291,8 +291,8 @@ async function createStore(domain: string) {
 
 			verbose(`Store site: ${site.name}`);
 			verbose(`${validPagesIds.length} valid pages from API`);
-			verbose(`changed ${pagesToDeleteFromStore.length} pages from API`);
-			verbose(`deleted ${changedPages.length} pages in store`);
+			verbose(`changed ${changedPages.length} pages from API`);
+			verbose(`deleted ${pagesToDeleteFromStore.length} pages from store`);
 			verbose(`missing ${pagesMissingInStore.length} pages in store`);
 			verbose(`write ${pagesToWriteToStore.length} pages to store`);
 

package/exporter/start-render.ts

@@ -11,7 +11,6 @@ async function startRender() {
 		process.exit(0);
 	} catch (error) {
 		console.log(error);
-		console.log("<[ Render will be reset ]>");
 		process.exit(1);
 	}
 }

package/exporter/utils/folders.ts

@@ -117,6 +117,7 @@ function copyDirsSync(
 			// Then copy src to dst
 			fs.cpSync(srcCompose, dstCompose, {
 				recursive: true,
+				preserveTimestamps: true,
 			});
 			if (withBackup) {
 				deleteBackup(dstCompose);

package/exporter/utils/integrations.ts

@@ -27,10 +27,16 @@ function filterBodyIntegrationFromPosition(
 }
 
 function filterHeadIntegrations(integrations: Array<Core.PageIntegration>) {
+	// A la hora de filtrar las integraciones, los addons si que tienen contenido en head
+	// pero en el caso de analytics y datalayer el contenido llega a null, pero deben ir en el <head>
 	return integrations
 		?.filter(
 			(integration) =>
-				integration.contentHead !== null && integration.contentHead !== ""
+				(integration.type==='addon' && integration.contentHead !== null && integration.contentHead !== "")
+				||
+				(integration.type === 'analytics')
+				||
+				(integration.type === 'datalayer')
 		)
 		.map((integration) => {
 			return {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.30",
+	"version": "10.4.32",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -48,7 +48,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "10.4.30",
+		"@griddo/core": "10.4.32",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-transform-runtime": "^6.23.0",
@@ -119,5 +119,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "b9de29bad583d1e4f40f614cab7f3944d3f057f6"
+	"gitHead": "151e9f780f11806f31b75c6a7fe425548377feee"
 }

package/src/components/Head.tsx

@@ -5,7 +5,6 @@ import * as React from "react";
 import { GriddoIntegrations } from "../../build/react";
 import { cleanCommaSeparated, formatImage } from "../utils";
 
-
 /**
  * Gatsby Head API
  * https://www.gatsbyjs.com/docs/reference/built-in-components/gatsby-head/
@@ -13,8 +12,6 @@ import { cleanCommaSeparated, formatImage } from "../utils";
 const Head = (props: CustomHeadProps) => {
 	const {
 		pageContext: {
-			griddoVersion,
-			renderDate,
 			locale,
 			openGraph,
 			page: {
@@ -137,12 +134,12 @@ const Head = (props: CustomHeadProps) => {
 			)}
 
 			{/* Debug */}
-			{!siteOptions?.avoidDebugMetas && (
+			{/* {!siteOptions?.avoidDebugMetas && (
 				<meta
 					property="debug"
 					content={`Griddo v${griddoVersion} @ ${renderDate}}`}
 				/>
-			)}
+			)} */}
 
 			{/* Keywords */}
 			{siteOptions?.useMetaKeywords && !!pageMetadata?.metaKeywords && (
@@ -155,6 +152,7 @@ const Head = (props: CustomHeadProps) => {
 				integrations={integrations}
 				dimensions={dimensions}
 				analyticScript={siteScript}
+				pageInfo={props}
 			/>
 		</>
 	);

package/build/utils/messages.d.ts

@@ -1,2 +0,0 @@
-export declare const printWarningMessage: (message: string, location: string, expected: string) => void;
-export declare const printErrorMessage: (message: string, location: string, expected: string) => void;

package/exporter/utils/messages.ts

@@ -1,53 +0,0 @@
-import chalk from "chalk";
-
-export const printWarningMessage = (
-	message: string,
-	location: string,
-	expected: string
-) => {
-	const heading = "  > PRINT WARNING MESSAGE";
-	const longestLineLength = Math.max(
-		message.length,
-		location.length,
-		heading.length,
-		expected.length
-	);
-	const line = "+".padEnd(longestLineLength + 15, "-") + "+";
-
-	console.log(line);
-	console.log(
-		chalk.keyword("orange").bold("|" + heading.padEnd(longestLineLength + 5))
-	);
-	console.log("|");
-	console.log("|" + `  Location: "${location}"`.padEnd(longestLineLength + 5));
-	console.log("|" + `  Message: ${message}`.padEnd(longestLineLength + 5));
-	console.log("|" + `  Expected: ${expected}`.padEnd(longestLineLength + 5));
-	console.log("|");
-	console.log(line + "\n");
-};
-
-export const printErrorMessage = (
-	message: string,
-	location: string,
-	expected: string
-) => {
-	const heading = "  > PRINT ERROR MESSAGE";
-	const longestLineLength = Math.max(
-		message.length,
-		location.length,
-		heading.length,
-		expected.length
-	);
-	const line = "+".padEnd(longestLineLength + 15, "-") + "+";
-
-	console.log(line);
-	console.log(
-		chalk.keyword("red").bold("|" + heading.padEnd(longestLineLength + 5))
-	);
-	console.log("|");
-	console.log("|" + `  Location: "${location}"`.padEnd(longestLineLength + 5));
-	console.log("|" + `  Message: ${message}`.padEnd(longestLineLength + 5));
-	console.log("|" + `  Expected: ${expected}`.padEnd(longestLineLength + 5));
-	console.log("|");
-	console.log(line + "\n");
-};