@griddo/cx 11.10.4-rc.1 → 11.10.4

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/ssg-adapters/gatsby/shared/sync-render.ts

@@ -5,7 +5,6 @@ import pLimit from "p-limit";
 
 import { findFilesBySuffix } from "../../../core/fs";
 import { GriddoLog } from "../../../core/GriddoLog";
-import { addLogToBuffer } from "../../../core/logger";
 import { GRIDDO_SSG_BUNDLE_ANALYZER } from "../../../shared/envs";
 import { getAssetsDiffBetweenRenders, patchHtmlFile } from "./diff-assets";
 
@@ -185,7 +184,7 @@ class SyncRender {
 		const changedHtmlFilePaths = this.state.htmlToAdd.map(({ from }) => from);
 
 		for (const htmlFilePath of changedHtmlFilePaths) {
-			addLogToBuffer(`Patching HTML file ${htmlFilePath} with the new webpackCompilationHash`);
+			GriddoLog.build(`Patching HTML file ${htmlFilePath} with the new webpackCompilationHash`);
 			await patchHtmlFile(htmlFilePath, webpackCompilationHash);
 		}
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "11.10.4-rc.1",
+	"version": "11.10.4",
 	"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": "0e7021e704a8f36957596114cfa4cfbb0449c20f"
+	"gitHead": "91fc938c684b01ce9c63d8359c0f0336f43fcd07"
 }