@griddo/cx 11.0.4 → 11.0.5

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

@@ -1,6 +1,5 @@
 import type { APIResponses } from "../types/api";
 import type { CXConfig, LifeCyclesNames } from "../types/global";
-import type { Site } from "../types/sites";
 declare const instanceRootDir: string;
 /**
  * Returns the configuration file content.
@@ -57,12 +56,6 @@ declare function getSafeSiteId(response: APIResponses): number | undefined;
  * @param props An array of props to be removed
  */
 declare function removeProperties(obj: Record<string, unknown>, props: Array<string>): void;
-/**
- * Return a list of sites with their names and ids.
- *
- * @param sites An array of sites objects
- */
-declare function siteList(sites: Array<Site>): string;
 /**
  * Remove unused files (old) inside the `apiCache` dir
  *
@@ -111,4 +104,4 @@ declare function doLifeCycle(name: LifeCyclesNames, options: {
  */
 declare function createRenderMetadata(domain: string): Promise<void>;
 declare function removeAllSiteDirsFromStore(): void;
-export { createRenderMetadata, delay, doLifeCycle, getConfig, getSafeSiteId, instanceRootDir, isTruthy, measureExecutionTime, msToSec, pause, removeAllSiteDirsFromStore, removeProperties, sanitizeAPICacheDir, siteList, walk, walkStore, };
+export { createRenderMetadata, delay, doLifeCycle, getConfig, getSafeSiteId, instanceRootDir, isTruthy, measureExecutionTime, msToSec, pause, removeAllSiteDirsFromStore, removeProperties, sanitizeAPICacheDir, walk, walkStore, };

package/build/utils/loggin.d.ts

@@ -1,4 +1,4 @@
-import type { Adapters } from "../adapters";
+import type { Site } from "../types/sites";
 /**
  * Custom basic logging function controlled by a environment variable.
  *
@@ -45,5 +45,6 @@ declare function pageSizeLog(size: number, measure?: string): string;
 /**
  * Print Griddo, adapter and Node version.
  */
-declare function printExporterLogo(adapter: Adapters): void;
-export { boxLog, buildLog, debugLog, infoLog, pageSizeLog, printExporterLogo, successLog, verboseLog, };
+declare function printExporterLogo(): void;
+declare function listSitesLog(title: string, sites: Array<Site>): void;
+export { boxLog, buildLog, debugLog, infoLog, listSitesLog, pageSizeLog, printExporterLogo, successLog, verboseLog, };

package/exporter/adapters/gatsby/index.ts

@@ -35,7 +35,7 @@ import {
 const config = getConfig();
 
 async function main() {
-	printExporterLogo("gatsby");
+	printExporterLogo();
 
 	const domains = await getInstanceDomains();
 

package/exporter/adapters/gatsby/utils.ts

@@ -59,6 +59,15 @@ function runGatsbyBuildCommand(assetPrefixWithDomain: string) {
 
 	const { __ssg } = config.paths();
 
+	// Remove `--openssl-legacy-provider` from NODE_OPTIONS because this value
+	// break Gataby render.
+	const nodeOptionsWithoutLegacyOpenSSL = process.env.NODE_OPTIONS
+		? process.env.NODE_OPTIONS.replace(
+				/--openssl-legacy-provider\s*/g,
+				"",
+			).trim()
+		: "";
+
 	const command = spawnSync(
 		"yarn",
 		["gatsby-build", envs.GRIDDO_SSG_VERBOSE_LOGS ? "--verbose" : ""],
@@ -70,6 +79,7 @@ function runGatsbyBuildCommand(assetPrefixWithDomain: string) {
 			env: Object.assign(process.env, {
 				GRIDDO_EXPORTER: "true",
 				SPAWN_ASSET_PREFIX_WITH_DOMAIN: assetPrefixWithDomain,
+				NODE_OPTIONS: nodeOptionsWithoutLegacyOpenSSL,
 			}),
 		},
 	);

package/exporter/services/store.ts

@@ -18,12 +18,8 @@ import { getReferenceFieldData } from "./reference-fields";
 import { getAllSettings } from "./settings";
 import { getPage } from "./sites";
 import { updatedSiteHash } from "../utils/cache";
-import {
-	getConfig,
-	removeAllSiteDirsFromStore,
-	siteList,
-} from "../utils/core-utils";
-import { buildLog, verboseLog } from "../utils/loggin";
+import { getConfig, removeAllSiteDirsFromStore } from "../utils/core-utils";
+import { buildLog, listSitesLog, verboseLog } from "../utils/loggin";
 import {
 	createGriddoListPages,
 	createGriddoMultiPages,
@@ -73,8 +69,8 @@ async function createStore(domain: string) {
 			console.warn(`There are no sites to update in the domain ${domain}`);
 		}
 
-		console.info(`Sites to publish: ${siteList(sitesToPublish)}`);
-		console.info(`Sites to unpublish: ${siteList(sitesToUnpublish)}`);
+		listSitesLog("Sites to publish:", sitesToPublish);
+		listSitesLog("Sites to unpublish:", sitesToUnpublish);
 
 		// Send unpublished sites to API.
 		// @todo ¿mover esta llamada al final del proceso de render?

package/exporter/utils/core-utils.ts

@@ -184,15 +184,6 @@ function removeProperties(obj: Record<string, unknown>, props: Array<string>) {
 	}
 }
 
-/**
- * Return a list of sites with their names and ids.
- *
- * @param sites An array of sites objects
- */
-function siteList(sites: Array<Site>) {
-	return sites.map(({ name, id }) => `${name} (${id})`).join(", ");
-}
-
 /**
  * Remove unused files (old) inside the `apiCache` dir
  *
@@ -353,7 +344,7 @@ async function doLifeCycle(
 		try {
 			infoLog(`start ${name} life-cycle`);
 			const exeTime = await measureExecutionTime(steps, delay);
-			successLog(`${name} - ${exeTime}s`);
+			successLog(`${name} - ${exeTime}s\n`);
 			// if no errors, print and go out
 			await pause(`${name} LifeCycle`);
 			break;
@@ -417,7 +408,6 @@ export {
 	removeAllSiteDirsFromStore,
 	removeProperties,
 	sanitizeAPICacheDir,
-	siteList,
 	walk,
 	walkStore,
 };

package/exporter/utils/folders.ts

@@ -62,8 +62,6 @@ const clearEmptyDirs = (baseDir: string) => {
 		fsx.rmdirSync(baseDir);
 		return;
 	}
-
-	verboseLog("remove empty site directories");
 };
 
 /**

package/exporter/utils/loggin.ts

@@ -1,10 +1,9 @@
-import type { Adapters } from "../adapters";
+import type { Site } from "../types/sites";
 
 import kleur from "kleur";
-import { version as reactVersion } from "react";
 
-import { getConfig } from "./core-utils";
 import { envs } from "../constants";
+import { getConfig } from "./core-utils";
 
 /**
  * Custom basic logging function controlled by a environment variable.
@@ -130,28 +129,39 @@ function pageSizeLog(size: number, measure = "KB") {
 /**
  * Print Griddo, adapter and Node version.
  */
-function printExporterLogo(adapter: Adapters) {
+function printExporterLogo() {
+	console.clear();
 	const config = getConfig();
 	const nodeVersion = process.version;
 	const { griddoVersion } = config;
-	const logo = `
-··
-··      Griddo ${griddoVersion}
-··
-··      Adapter: ${adapter}
-··      Node: ${nodeVersion}
-··      React: ${reactVersion}
-··
-`;
+	const logo = `\n${kleur.bold("Griddo Exporter " + griddoVersion)} ${kleur.dim("~ node " + nodeVersion)}\n`;
 
 	console.log(logo);
 }
 
+function listSitesLog(title: string, sites: Array<Site>) {
+	const maxline = Math.max(
+		...sites.map((s) => s.name.length + s.id.toString().length),
+	);
+
+	const sitesStr = sites.map((s) => {
+		const lineLen = s.name.length + s.id.toString().length;
+		const padding = " ".repeat(maxline - lineLen);
+		return `${kleur.bold(s.name)} ${kleur.dim("(" + s.id + ")")} ${padding}${kleur.dim("-")} ${kleur.dim(s.slug)}`;
+	});
+
+	console.log(`
+${title}
+
+${sitesStr.join("\n") || "---"}`);
+}
+
 export {
 	boxLog,
 	buildLog,
 	debugLog,
 	infoLog,
+	listSitesLog,
 	pageSizeLog,
 	printExporterLogo,
 	successLog,

package/gatsby-node.ts

@@ -34,7 +34,7 @@ const pages = getBuildPagesFromStore<GatsbyPageObject>({
 const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
 	verboseLog(`read assetPrefixWithDomain=${assetPrefixWithDomain}`);
 	verboseLog(`set needsAssetDomainPrefix=${needsAssetDomainPrefix}`);
-	verboseLog(
+	console.log(
 		`using this NODE_OPTIONS in gatsby-node.ts: ${process.env.NODE_OPTIONS}`,
 	);
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "11.0.4",
+	"version": "11.0.5",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -60,7 +60,7 @@
 		"@babel/preset-env": "7.24.7",
 		"@babel/preset-react": "7.24.7",
 		"@babel/preset-typescript": "7.24.7",
-		"@griddo/core": "11.0.4",
+		"@griddo/core": "11.0.5",
 		"@svgr/webpack": "8.1.0",
 		"axios": "^1.7.4",
 		"babel-loader": "9.1.3",
@@ -127,5 +127,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "b97706dc29f2f8066e22ca49a9ee9c8959e8f820"
+	"gitHead": "b528c1933f0fe79e4feedacd2247336ab8f967a4"
 }