@griddo/cx 11.10.4-rc.3 → 11.10.5

package/build/shared/endpoints.d.ts

@@ -10,9 +10,10 @@ declare const SEARCH: string;
 declare const SETTINGS: string;
 declare const BUILD_END: string[];
 declare const BUILD_START: string[];
+declare const GET_PAGES: string[];
 declare const GET_REFERENCE_FIELD_DATA: string[];
 declare const GET_SITEMAP: string[];
 declare const INFO: string[];
 declare const LANGUAGES: string[];
 declare const SOCIALS: string[];
-export { AI_EMBEDDINGS, ALERT, BUILD_END, BUILD_START, DOMAINS, GET_ALL, GET_PAGE, GET_REFERENCE_FIELD_DATA, GET_SITEMAP, INFO, LANGUAGES, LOGIN, RESET_RENDER, ROBOTS, SEARCH, SETTINGS, SOCIALS, };
+export { AI_EMBEDDINGS, ALERT, BUILD_END, BUILD_START, DOMAINS, GET_ALL, GET_PAGE, GET_PAGES, GET_REFERENCE_FIELD_DATA, GET_SITEMAP, INFO, LANGUAGES, LOGIN, RESET_RENDER, ROBOTS, SEARCH, SETTINGS, SOCIALS, };

package/exporter/react/GriddoIntegrations/index.tsx

@@ -4,10 +4,10 @@ import type { Dimensions } from "../../shared/types/pages";
 import * as React from "react";
 
 import { generateAutomaticDimensions } from "@griddo-instance";
+import parse from "html-react-parser";
 
 import {
 	composeAnalytics,
-	extractScriptContent,
 	filterBodyIntegrationFromPosition,
 	filterHeadIntegrations,
 } from "./utils";
@@ -66,13 +66,9 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 			`https://www.googletagmanager.com/gtag/js?id=${analyticsScript}`) ||
 		null;
 
-	const siteScriptContent = extractScriptContent(siteScript);
-
 	return (
 		<>
 			{integrationsOrdered?.map((integration, key) => {
-				const integrationScriptContent = extractScriptContent(integration.content);
-
 				/* Data Layer */
 				if (integration.type === "datalayer") {
 					return (
@@ -91,16 +87,18 @@ function GriddoIntegrations(props: GriddoIntegrationsProps) {
 						return <script key={key} src={analyticsWithUA} data-griddo-id={id} />;
 					}
 
-					return siteScriptContent ? (
-						<script key={key} dangerouslySetInnerHTML={{ __html: siteScriptContent }} />
-					) : null;
+					return (
+						<React.Fragment key={key}>
+							{siteScript && parse(siteScript, { trim: true })}
+						</React.Fragment>
+					);
 				}
 
 				/* Integration integration.type === "addon" */
 				if (integration.type === "addon") {
-					return integrationScriptContent ? (
-						<script key={key} dangerouslySetInnerHTML={{ __html: integrationScriptContent }} />
-					) : null;
+					return (
+						<React.Fragment key={key}>{parse(integration.content, { trim: true })}</React.Fragment>
+					);
 				}
 
 				return null;

package/exporter/react/GriddoIntegrations/utils.ts

@@ -109,25 +109,8 @@ function composeAnalytics(
 	};
 }
 
-function extractScriptContent(rawInput?: unknown) {
-	if (typeof rawInput !== "string" || !rawInput) {
-		return null;
-	}
-
-	const trimmedInput = rawInput.trim();
-
-	if (!trimmedInput.startsWith("<script>") || !trimmedInput.endsWith("</script>")) {
-		return null;
-	}
-
-	const content = trimmedInput.replace(/<script>|<\/script>/g, "").trim();
-
-	return content || null;
-}
-
 export {
 	composeAnalytics,
-	extractScriptContent,
 	filterBodyIntegrationFromPosition,
 	filterHeadIntegrations,
 	filterPositionIntegrations,

package/exporter/services/api.ts

@@ -16,7 +16,6 @@ import { RenderError } from "../core/errors";
 import { pathExists } from "../core/fs";
 import { GriddoLog } from "../core/GriddoLog";
 import { addLogToBuffer } from "../core/logger";
-import { DEFAULT_HEADERS } from "../shared/headers";
 import { brush } from "../shared/npm-modules/brush";
 import { AuthService } from "./auth";
 import { getRenderPathsHydratedWithDomainFromDB } from "./render";
@@ -77,10 +76,7 @@ async function requestAPI<T extends APIResponses>(
 		// Prepare fetch options
 		const fetchOptions: RequestInit = {
 			method: method.toUpperCase(),
-			headers: Object.assign({}, DEFAULT_HEADERS, headers, AuthService.headers) as Record<
-				string,
-				string
-			>,
+			headers: Object.assign({}, headers, AuthService.headers) as Record<string, string>,
 		};
 
 		// Add body for non-GET requests

package/exporter/services/auth.ts

@@ -4,7 +4,6 @@ import { throwError } from "../core/errors";
 import { LOGIN } from "../shared/endpoints";
 import { GRIDDO_BOT_PASSWORD, GRIDDO_BOT_USER } from "../shared/envs";
 import { LoginError } from "../shared/errors";
-import { DEFAULT_HEADERS } from "../shared/headers";
 
 class AuthService {
 	headers: AuthHeaders | undefined;
@@ -13,10 +12,7 @@ class AuthService {
 		try {
 			const response = await fetch(LOGIN, {
 				method: "POST",
-				headers: Object.assign({}, DEFAULT_HEADERS, {
-					"Content-Type": "application/json",
-					Connection: "close",
-				}),
+				headers: { "Content-Type": "application/json", Connection: "close" },
 				body: JSON.stringify({
 					username: GRIDDO_BOT_USER,
 					password: GRIDDO_BOT_PASSWORD,

package/exporter/shared/endpoints.ts

@@ -16,6 +16,7 @@ const SETTINGS = `${GRIDDO_API_URL}/settings`;
 const SITE_URI = `${GRIDDO_API_URL}/site/`;
 const BUILD_END = [SITE_URI, "/build/end"];
 const BUILD_START = [SITE_URI, "/build/start"];
+const GET_PAGES = [SITE_URI, "/pages?pagination=false"];
 const GET_REFERENCE_FIELD_DATA = [SITE_URI, "/distributor"];
 const GET_SITEMAP = [SITE_URI, "/sitemap"];
 const INFO = [SITE_URI, "/all"];
@@ -30,6 +31,7 @@ export {
 	DOMAINS,
 	GET_ALL,
 	GET_PAGE,
+	GET_PAGES,
 	GET_REFERENCE_FIELD_DATA,
 	GET_SITEMAP,
 	INFO,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "11.10.4-rc.3",
+	"version": "11.10.5",
 	"authors": [
 		"Hisco <francis.vega@griddo.io>"
 	],
@@ -56,7 +56,8 @@
 		"watch:ts-lint": "tsc --noEmit --watch"
 	},
 	"dependencies": {
-		"gatsby": "5.15.0"
+		"gatsby": "5.15.0",
+		"html-react-parser": "^5.2.10"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.3.4",
@@ -93,5 +94,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "bcd57d7f4aeeb8a1d939c464fd44ac26a5393103"
+	"gitHead": "c53ffb9d9d4890b4ef87a00decb31f178247779f"
 }

package/build/shared/headers.d.ts

@@ -1,5 +0,0 @@
-export declare const DEFAULT_HEADERS: {
-    readonly "x-application-id": "griddo-cx";
-    readonly "x-client-version": string;
-    readonly "x-client-name": "CX";
-};

package/exporter/shared/headers.ts

@@ -1,7 +0,0 @@
-import packageJson from "../../package.json";
-
-export const DEFAULT_HEADERS = {
-	"x-application-id": "griddo-cx",
-	"x-client-version": packageJson.version,
-	"x-client-name": "CX",
-} as const;