@griddo/cx 10.4.21 → 10.4.22

package/build/utils/temp-utils.d.ts

@@ -1,10 +1,15 @@
 import { CXConfig } from "../types/global";
+declare const attempts: {
+    prepare: any;
+    restore: any;
+    data: any;
+    ssg: any;
+    relocation: any;
+    meta: any;
+    archive: any;
+    clean: any;
+};
 declare function getConfig(): CXConfig;
-/**
- * Update the Griddo's `/dist` dir with the contents from `public` dir only
- * with files of type: js, json and css.
- */
-declare function legacy__createDistFromGatsbyPublic(domain: string, needsAssetPrefix: boolean): Promise<void>;
 declare function griddoCreateInitialDirectories(domain: string): Promise<void>;
 declare function griddoCleanDisposableDirectories(domain: string): Promise<void>;
-export { getConfig, griddoCleanDisposableDirectories, griddoCreateInitialDirectories, legacy__createDistFromGatsbyPublic, };
+export { attempts, getConfig, griddoCleanDisposableDirectories, griddoCreateInitialDirectories, };

package/exporter/adapters/gatsby/index.ts

@@ -1,7 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import { attempts, gatsbyBuild, getGatsbyAssetPrefixSlug } from "./utils";
+import {
+	gatsbyBuild,
+	getGatsbyAssetPrefixWithDomain,
+	legacy__createDistFromGatsbyPublic,
+} from "./utils";
 import { RobotsService } from "../../services/robots";
 import { createBuildData } from "../../utils/create-build-data";
 import { getInstanceDomains } from "../../utils/domains";
@@ -20,10 +24,7 @@ import {
 	printExporterLogo,
 } from "../../utils/shared";
 import { generateBuildReport, generateSitemaps } from "../../utils/sites";
-import {
-	getConfig,
-	legacy__createDistFromGatsbyPublic,
-} from "../../utils/temp-utils";
+import { attempts, getConfig } from "../../utils/temp-utils";
 
 async function runGatsbyAdapter() {
 	printExporterLogo("gatsby");
@@ -38,7 +39,9 @@ async function runGatsbyAdapter() {
 
 		logBox(`Initializing render for the domain ${domain}`, "", 1, 0);
 
-		const assetPrefix = getGatsbyAssetPrefixSlug(domain);
+		// This variables are for both, create the dist directory from public
+		// and pass to the gatsby-build command via spawnSync.
+		const assetPrefix = getGatsbyAssetPrefixWithDomain(domain);
 		const needsAssetPrefix = !!assetPrefix && assetPrefix !== "";
 
 		/*
@@ -119,7 +122,7 @@ async function runGatsbyAdapter() {
 		await doLifeCycle({
 			name: "SSG",
 			attempts: attempts.ssg,
-			steps: [() => gatsbyBuild(domain), () => pause("SSG LifeCycle")],
+			steps: [() => gatsbyBuild(assetPrefix), () => pause("SSG LifeCycle")],
 		});
 
 		/*

package/exporter/adapters/gatsby/utils.ts

@@ -1,7 +1,10 @@
+import type { Fields } from "@griddo/core";
+
 import { spawnSync } from "node:child_process";
+import path from "node:path";
 
-import { Fields } from "@griddo/core";
 import dotenv from "dotenv";
+import fsx from "fs-extra";
 
 import { getConfig } from "../../utils/temp-utils";
 
@@ -9,23 +12,16 @@ dotenv.config();
 
 const config = getConfig();
 
-const attempts = {
-	prepare: JSON.parse(process.env.GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	restore: JSON.parse(process.env.GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	data: JSON.parse(process.env.GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	ssg: JSON.parse(process.env.GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	relocation: JSON.parse(
-		process.env.GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS || "1"
-	),
-	meta: JSON.parse(process.env.GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	archive: JSON.parse(process.env.GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS || "1"),
-	clean: JSON.parse(process.env.GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS || "1"),
-};
-
 /**
- * Return the assetPrefix url `assetPrefix/domain`
+ * Return the assetPrefix with the domain concatenated `assetPrefix/domain` only
+ * if the domain is "pro-" **and** there is a env `GRIDDO_ASSET_PREFIX` with any
+ * value different from `null`, `undefined` or `empty string`
+ *
+ * else...
+ * - If assetPrefix or domain is falsy, returns ""
+ * - If the domain is not "pro-", returns ""
  */
-function getGatsbyAssetPrefixSlug(domain: string) {
+function getGatsbyAssetPrefixWithDomain(domain: string) {
 	const { proDomain } = getConfig();
 	const assetPrefix =
 		process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX;
@@ -33,6 +29,18 @@ function getGatsbyAssetPrefixSlug(domain: string) {
 	if (!assetPrefix || !domain) return "";
 	if (!domain.startsWith(proDomain)) return "";
 
+	if (process.env.GRIDDO_DEBUG_LOGS) {
+		console.log();
+		console.log("-- getGatsbyAssetPrefixWithDomain() --");
+		console.log(
+			"process.env.GRIDDO_ASSET_PREFIX",
+			process.env.GRIDDO_ASSET_PREFIX
+		);
+		console.log("assetPrefix", assetPrefix);
+		console.log("return", `${assetPrefix}/${domain}`);
+		console.log();
+	}
+
 	return `${assetPrefix}/${domain}`;
 }
 
@@ -86,8 +94,17 @@ function addCloudinaryParams(image: string, params: string) {
 	return `https://${head}/${params}${fullId}`;
 }
 
-function gatsbyBuild(domain: string) {
-	const assetPrefix = getGatsbyAssetPrefixSlug(domain);
+/**
+ * Spawn a new node process `yarn gatsby-build`
+ * @note This proccess (`yarn gatsby-build`) can not access to the custom Griddo
+ * `process.env` so it needs variables passed to it via the `env` prop.
+ */
+function gatsbyBuild(assetPrefixWithDomain: string) {
+	if (process.env.GRIDDO_DEBUG_LOGS) {
+		console.log("-- gatsbyBuild() --");
+		console.log("assetPrefixWithDomain", assetPrefixWithDomain);
+	}
+
 	const { __ssg } = config.paths();
 
 	const command = spawnSync("yarn", ["gatsby-build"], {
@@ -97,7 +114,7 @@ function gatsbyBuild(domain: string) {
 		shell: true,
 		env: Object.assign(process.env, {
 			GRIDDO_EXPORTER: "true",
-			LOCAL_GRIDDO_ASSET_PREFIX: assetPrefix,
+			SPAWN_ASSET_PREFIX_WITH_DOMAIN: assetPrefixWithDomain,
 		}),
 	});
 
@@ -106,4 +123,71 @@ function gatsbyBuild(domain: string) {
 	}
 }
 
-export { attempts, formatImage, gatsbyBuild, getGatsbyAssetPrefixSlug };
+/**
+ * Update the Griddo's `/dist` dir with the contents from `public` dir only
+ * with files of type: js, json and css.
+ */
+async function legacy__createDistFromGatsbyPublic(
+	domain: string,
+	needsAssetPrefix: boolean
+) {
+	const { __cx, __ssg } = config.paths(domain);
+
+	const cxDistDir = path.join(__cx, "dist");
+	const cxAssetsDir = path.join(__cx, "assets");
+	const cxDistDirWithDomain = path.join(__cx, "dist", domain);
+	const publicDir = path.join(__ssg, "public");
+
+	console.log(publicDir);
+	const validFilesFromPublic = fsx
+		.readdirSync(publicDir)
+		.filter(
+			(file) =>
+				path.extname(file) === ".js" ||
+				path.extname(file) === ".json" ||
+				path.extname(file) === ".css"
+		);
+
+	const pageDataSrc = `${publicDir}/page-data`;
+	const pageDataDest = `${cxAssetsDir}/page-data`;
+
+	const projectStaticSrc = path.join(__ssg, "static");
+	const projectStaticDest = cxAssetsDir;
+
+	const gatsbyStaticSrc = `${cxDistDir}/static`;
+	const gatsbyStaticDest = `${cxAssetsDir}/static`;
+
+	try {
+		fsx.mkdirSync(cxAssetsDir, { recursive: true });
+		fsx.copySync(publicDir, cxDistDir);
+
+		if (needsAssetPrefix) {
+			fsx.copySync(pageDataSrc, pageDataDest);
+			if (fsx.existsSync(projectStaticSrc)) {
+				fsx.copySync(projectStaticSrc, projectStaticDest, { overwrite: false });
+			}
+			fsx.copySync(gatsbyStaticSrc, gatsbyStaticDest, { overwrite: false });
+			if (fsx.existsSync(projectStaticSrc)) {
+				fsx.copySync(projectStaticSrc, cxDistDirWithDomain, {
+					overwrite: false,
+				});
+			}
+
+			// Copia el resto de archivos...
+			validFilesFromPublic.map(async (file) => {
+				const fileSrc = `${publicDir}/${file}`;
+				const fileDest = `${cxAssetsDir}/${file}`;
+				fsx.copySync(fileSrc, fileDest);
+			});
+		}
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+export {
+	formatImage,
+	gatsbyBuild,
+	getGatsbyAssetPrefixWithDomain,
+	legacy__createDistFromGatsbyPublic,
+};

package/exporter/browser/index.ts

@@ -1,4 +1,4 @@
-import { Core } from "@griddo/core";
+import type { Core } from "@griddo/core";
 
 function filterBodyIntegrationFromPosition(
 	integrations: Array<Core.PageIntegration>,

package/exporter/build-complete.ts

@@ -34,15 +34,15 @@ type Report = {
 export async function buildComplete(report: Report) {
 	await AuthService.login();
 
-	const promises = report.sites.map((site) => {
+	const sites = report.sites;
+
+	for (const site of sites) {
 		const { siteId, ...body } = site;
 
 		console.info(`Deploying ending call to site ${siteId}:`);
 
-		return SitesService.endSiteRender(siteId, body);
-	});
-
-	await Promise.all(promises);
+		await SitesService.endSiteRender(siteId, body);
+	}
 
 	console.info(`Build end's signal sent for ${report.sites.length} site(s)`);
 }

package/exporter/utils/temp-utils.ts

@@ -1,12 +1,23 @@
-import path from "node:path";
-
-import fsx from "fs-extra";
+import dotenv from "dotenv";
 
 import { createDirsSync, removeDirsSync } from "./folders";
 import { CXConfig } from "../types/global";
-
+dotenv.config();
 const config = getConfig();
 
+const attempts = {
+	prepare: JSON.parse(process.env.GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	restore: JSON.parse(process.env.GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	data: JSON.parse(process.env.GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	ssg: JSON.parse(process.env.GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	relocation: JSON.parse(
+		process.env.GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS || "1"
+	),
+	meta: JSON.parse(process.env.GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	archive: JSON.parse(process.env.GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS || "1"),
+	clean: JSON.parse(process.env.GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS || "1"),
+};
+
 function getConfig(): CXConfig {
 	try {
 		// eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-missing-require, node/no-unpublished-require
@@ -20,68 +31,6 @@ function getConfig(): CXConfig {
 	}
 }
 
-/**
- * Update the Griddo's `/dist` dir with the contents from `public` dir only
- * with files of type: js, json and css.
- */
-async function legacy__createDistFromGatsbyPublic(
-	domain: string,
-	needsAssetPrefix: boolean
-) {
-	const { __cx, __ssg } = config.paths(domain);
-
-	const cxDistDir = path.join(__cx, "dist");
-	const cxAssetsDir = path.join(__cx, "assets");
-	const cxDistDirWithDomain = path.join(__cx, "dist", domain);
-	const publicDir = path.join(__ssg, "public");
-
-	console.log(publicDir);
-	const validFilesFromPublic = fsx
-		.readdirSync(publicDir)
-		.filter(
-			(file) =>
-				path.extname(file) === ".js" ||
-				path.extname(file) === ".json" ||
-				path.extname(file) === ".css"
-		);
-
-	const pageDataSrc = `${publicDir}/page-data`;
-	const pageDataDest = `${cxAssetsDir}/page-data`;
-
-	const projectStaticSrc = path.join(__ssg, "static");
-	const projectStaticDest = cxAssetsDir;
-
-	const gatsbyStaticSrc = `${cxDistDir}/static`;
-	const gatsbyStaticDest = `${cxAssetsDir}/static`;
-
-	try {
-		fsx.mkdirSync(cxAssetsDir, { recursive: true });
-		fsx.copySync(publicDir, cxDistDir);
-
-		if (needsAssetPrefix) {
-			fsx.copySync(pageDataSrc, pageDataDest);
-			if (fsx.existsSync(projectStaticSrc)) {
-				fsx.copySync(projectStaticSrc, projectStaticDest, { overwrite: false });
-			}
-			fsx.copySync(gatsbyStaticSrc, gatsbyStaticDest, { overwrite: false });
-			if (fsx.existsSync(projectStaticSrc)) {
-				fsx.copySync(projectStaticSrc, cxDistDirWithDomain, {
-					overwrite: false,
-				});
-			}
-
-			// Copia el resto de archivos...
-			validFilesFromPublic.map(async (file) => {
-				const fileSrc = `${publicDir}/${file}`;
-				const fileDest = `${cxAssetsDir}/${file}`;
-				fsx.copySync(fileSrc, fileDest);
-			});
-		}
-	} catch (err) {
-		console.error(err);
-	}
-}
-
 async function griddoCreateInitialDirectories(domain: string) {
 	const { __exports, __caches } = config.paths(domain);
 
@@ -96,8 +45,8 @@ async function griddoCleanDisposableDirectories(domain: string) {
 }
 
 export {
+	attempts,
 	getConfig,
 	griddoCleanDisposableDirectories,
 	griddoCreateInitialDirectories,
-	legacy__createDistFromGatsbyPublic,
 };

package/gatsby-config.ts

@@ -6,9 +6,22 @@ import { resolveComponentsPath } from "./build";
 
 dotenv.config();
 
-// Este process.env.GRIDDO_ASSET_PREFIX se lee porque se ha introducido en
-// `getEnvRunner()`.
-const GRIDDO_ASSET_PREFIX = process.env.LOCAL_GRIDDO_ASSET_PREFIX || undefined;
+// Este process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN se lee porque
+// se ha introducido en el spawnSync.
+// @todo quiar el `... || undefined`
+const griddoAssetPrefixWithDomain =
+	process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN || undefined;
+
+if (process.env.GRIDDO_DEBUG_LOGS) {
+	console.log();
+	console.log("-- gatsby-config.ts --");
+	console.log(
+		"process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN",
+		process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN
+	);
+	console.log("griddoAssetPrefixWithDomain", griddoAssetPrefixWithDomain);
+	console.log();
+}
 
 // Gatsby configuration file from client
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -40,8 +53,8 @@ const config: GatsbyConfig = {
 	],
 };
 
-if (GRIDDO_ASSET_PREFIX) {
-	config.assetPrefix = GRIDDO_ASSET_PREFIX;
+if (griddoAssetPrefixWithDomain) {
+	config.assetPrefix = griddoAssetPrefixWithDomain;
 	// @ts-expect-error Must be null to exist, but must be different from assetPrefix
 	config.pathPrefix = null;
 }

package/gatsby-node.ts

@@ -5,31 +5,46 @@ import path from "node:path";
 
 import { getConfig, logInfo, logPageSize } from "./build";
 import { getBuildPagesFromStore } from "./exporter/utils/store";
-import { getMatchPath } from "./src/gatsby-node-utils";
 
-const GRIDDO_BUILD_LOGS = JSON.parse(process.env.GRIDDO_BUILD_LOGS || "false");
+const griddoBuildLogs = JSON.parse(process.env.GRIDDO_BUILD_LOGS || "false");
+const assetPrefixWithDomain = process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN;
+const needsAssetDomainPrefix =
+	!!assetPrefixWithDomain && assetPrefixWithDomain !== "";
+
+if (process.env.GRIDDO_DEBUG_LOGS) {
+	console.log();
+	console.log("-- gatsby-node.ts --");
+	console.log("assetPrefixWithDomain", assetPrefixWithDomain);
+	console.log("needsAssetDomainPrefix", needsAssetDomainPrefix);
+	console.log();
+}
 
 const { __ssg } = getConfig().paths();
 const template = path.join(__ssg, "src/components/template.tsx");
 const pages = getBuildPagesFromStore<GatsbyPageObject>({
-	withSizeProp: GRIDDO_BUILD_LOGS,
+	withSizeProp: griddoBuildLogs,
 });
 
 const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
 	for await (const page of pages) {
 		if (!page) return;
 
-		const matchPath = getMatchPath(
-			page.context.fullPath.domain,
-			page.context.fullPath.compose
-		);
-
 		page.component = template;
-		page.matchPath = matchPath;
+		page.matchPath = needsAssetDomainPrefix
+			? page.context.fullPath.compose
+			: "";
+
+		if (process.env.GRIDDO_DEBUG_LOGS) {
+			console.log("-- createPages --");
+			console.log(
+				"matchPath",
+				needsAssetDomainPrefix ? page.context.fullPath.compose : ""
+			);
+		}
 
 		actions.createPage(page);
 
-		if (GRIDDO_BUILD_LOGS) {
+		if (griddoBuildLogs) {
 			const path = page.path;
 			const id = page.context.id;
 			const size = logPageSize(Math.round(page.size || 0));

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.21",
+	"version": "10.4.22",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -45,7 +45,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^10.4.21",
+		"@griddo/core": "^10.4.22",
 		"@svgr/webpack": "^5.5.0",
 		"@types/cheerio": "^0.22.35",
 		"babel-loader": "^8.0.6",
@@ -120,5 +120,5 @@
 	"resolutions": {
 		"memoizee": "0.4.15"
 	},
-	"gitHead": "e9ee5308a0c6829e0e3c0c82d28f5e580d0bb804"
+	"gitHead": "dcf2ff097694c07588c2fc14c0e5934d2d675220"
 }

package/src/components/template.tsx

@@ -1,6 +1,7 @@
 import type { TemplateProps } from "../types";
+import type { Core } from "@griddo/core";
 
-import { Core, Page as RenderGriddoPage } from "@griddo/core";
+import { Page as RenderGriddoPage } from "@griddo/core";
 import { components, SiteProvider, templates } from "@griddo-instance";
 import { Link, navigate } from "gatsby";
 import parse from "html-react-parser";

package/src/gatsby-node-utils.ts

@@ -2,12 +2,11 @@ import type { GatsbyNode } from "gatsby";
 
 import fs from "fs-extra";
 
-import { getConfig } from "../build";
 import {
 	IS_COMPONENT_LIBRARY,
 	PROJECT_ALIASES,
 	resolveComponentsPath,
-} from "../exporter/utils/instance";
+} from "../build";
 
 /**
  * Copy the instance's `/static` dir into the Gatsby's to include it in the render assets.
@@ -72,40 +71,4 @@ const onCreateWebpackConfig: GatsbyNode["onCreateWebpackConfig"] = ({
 	}
 };
 
-function getGatsbyAssetPrefixSlug(domain: string) {
-	const { proDomain } = getConfig();
-
-	const assetPrefix =
-		process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX;
-	if (!assetPrefix || !domain) return "";
-	if (!domain.startsWith(proDomain)) return "";
-
-	return `${assetPrefix}/${domain}`;
-}
-
-// @todo: Arreglar esta movida de variables de entorno locales solo para Gatsby
-function getLocalGatsbyAssetPrefixSlug(domain: string) {
-	const { proDomain } = getConfig();
-
-	const assetPrefix = process.env.LOCAL_GRIDDO_ASSET_PREFIX;
-	if (!assetPrefix || !domain) return "";
-	if (!domain.startsWith(proDomain)) return "";
-
-	return `${assetPrefix}/${domain}`;
-}
-
-function getMatchPath(domain: string, compose: string) {
-	const domainWithNoSlashes = domain.replace("/", "");
-	const assetPrefix = getLocalGatsbyAssetPrefixSlug(domainWithNoSlashes);
-	const needsAssetDomainPrefix = assetPrefix && assetPrefix !== "";
-	const matchPath = needsAssetDomainPrefix ? compose : "";
-
-	return matchPath;
-}
-
-export {
-	getGatsbyAssetPrefixSlug,
-	getMatchPath,
-	onCreateWebpackConfig,
-	prepareStaticDir,
-};
+export { onCreateWebpackConfig, prepareStaticDir };

package/src/types.ts

@@ -1,15 +1,14 @@
-import type { Core } from "@griddo/core";
-import type { HeadProps } from "gatsby";
-
-import { SocialsResponse } from "../build";
-import {
+import type {
 	AdditionalInfo,
 	GriddoListPage,
 	GriddoMultiPage,
 	GriddoPageObject,
 	GriddoSinglePage,
-} from "../exporter/types/pages";
-import { Site } from "../exporter/types/sites";
+	Site,
+	SocialsResponse,
+} from "../build";
+import type { Core } from "@griddo/core";
+import type { HeadProps } from "gatsby";
 
 interface CustomHeadProps extends HeadProps {
 	pageContext: GriddoPageObject["context"] & {