@griddo/cx 10.6.15 → 10.6.16

package/exporter/utils/core-utils.ts

@@ -114,6 +114,40 @@ function walk(dir: string) {
 	return results;
 }
 
+/**
+ * Walk a directory and returns the JSON file absolute paths with one level of depth.
+ * Bypass the `metadata` folder.
+ * /abs/.../sotre/<siteId>/jsonfile.json
+ * /abs/.../sotre/<siteId>/jsonfile.json
+ * /abs/.../sotre/<siteId>/jsonfile.json
+ * /abs/.../sotre/<siteId>/jsonfile.json
+ */
+function walkStore(dir: string): Array<string> {
+	const results: Array<string> = [];
+
+	// Listamos todas las subcarpetas y evitamos entrar en 'metadata'
+	const subdirs = fs.readdirSync(dir).filter((file) => {
+		const fullPath = path.join(dir, file);
+		return fs.statSync(fullPath).isDirectory() && file !== "metadata";
+	});
+
+	// Iteramos sobre las subcarpetas
+	for (const subdir of subdirs) {
+		const subdirPath = path.join(dir, subdir);
+
+		// Listamos los archivos en cada subcarpeta y filtramos los .json
+		const files = fs
+			.readdirSync(subdirPath)
+			.filter((file) => file.endsWith(".json"));
+
+		for (const file of files) {
+			results.push(path.join(subdirPath, file));
+		}
+	}
+
+	return results;
+}
+
 /**
  * Custom delay using the "promise hack",
  *
@@ -393,4 +427,5 @@ export {
 	sanitizeAPICacheDir,
 	siteList,
 	walk,
+	walkStore,
 };

package/exporter/utils/folders.ts

@@ -3,9 +3,8 @@ import path from "node:path";
 
 import fsx, { MakeDirectoryOptions } from "fs-extra";
 
-import { getConfig } from "./core-utils";
+import { getConfig, walkStore } from "./core-utils";
 import { verboseLog } from "./loggin";
-import { getPageInStoreDir, removePagesFromStore } from "./store";
 
 const config = getConfig();
 
@@ -196,17 +195,23 @@ function createBackup(src: string, suffix = "-BACKUP") {
 	}
 }
 
-function isVirtualPage(id: number) {
-	return Number.isInteger(id) && id < 0;
-}
-
+/**
+ * Elimina todas las páginas del store (de todos los sites) cuyo nombre empiece con un guión "-".
+ * Estas páginas son "virtuales" y no tienen ids desde API por lo que mantenerlas en el store es un problema cuando se hacen modificaciones en la página "madre".
+ * La solución por ahora es borrarlas del store y rehacerlas en todos los renders.
+ */
 async function removeVirtualPagesFromStore() {
 	const { __cx } = config.paths();
 	const storePath = path.join(__cx, "store");
 
 	try {
-		const multiPageFiles = getPageInStoreDir(storePath).filter(isVirtualPage);
-		removePagesFromStore(multiPageFiles);
+		const allJsonPageFilesPath = walkStore(storePath);
+
+		for (const filePath of allJsonPageFilesPath) {
+			if (path.basename(filePath).startsWith("-")) {
+				fs.unlinkSync(filePath);
+			}
+		}
 	} catch (e) {
 		console.info(
 			"`store` folder does not exist. Skipping multipage or static list template cleaning.",

package/exporter/utils/loggin.ts

@@ -69,7 +69,7 @@ function boxLog(
  */
 function buildLog(str: string) {
 	if (envs.GRIDDO_BUILD_LOGS) {
-		console.info(str.replace(/(\s)\s+/g, "$1").trim());
+		console.log(str.replace(/(\s)\s+/g, "$1").trim());
 	}
 }
 
@@ -78,7 +78,7 @@ function buildLog(str: string) {
  * @param str The string to be logged.
  */
 function infoLog(str: string) {
-	console.info(`${kleur.blue("info")} ${str}`);
+	console.log(`${kleur.blue("info")} ${str}`);
 }
 
 /**
@@ -86,7 +86,7 @@ function infoLog(str: string) {
  * @param str The string to be logged.
  */
 function successLog(str: string) {
-	console.info(`${kleur.green("success")} ${str}`);
+	console.log(`${kleur.green("success")} ${str}`);
 }
 
 /**

package/exporter/utils/sites.ts

@@ -62,15 +62,21 @@ async function checkSites(domain: string) {
 		}
 	}
 
+	// Sites with domains as empty arrays are sites that are not from the
+	// current domain.
+	const validSitesFromCurrentDomain = validSites.filter(
+		(site) => site.domains.length > 0,
+	);
+
 	// Save sites object to publish
-	const sitesToPublish = validSites.filter((site) =>
+	const sitesToPublish = validSitesFromCurrentDomain.filter((site) =>
 		envs.GRIDDO_RENDER_SITE
 			? site.id === envs.GRIDDO_RENDER_SITE
-			: !!site.isPublished && site.domains.length > 0,
+			: !!site.isPublished,
 	);
 
 	// Save sites object to unpublish
-	const sitesToUnpublish = validSites.filter(
+	const sitesToUnpublish = validSitesFromCurrentDomain.filter(
 		(site) => !site.isPublished && site.shouldBeUpdated,
 	);
 
@@ -88,7 +94,10 @@ async function checkSites(domain: string) {
  * @see https://griddoio.notion.site/Sites-d7bb0b7cb8d24894a5337e1139fc3d09#2019d3255bda4d219c7e19cf28d0c4fe
  */
 async function unpublishSites(sites: Array<Site>) {
+	const { __cx } = config.paths();
+
 	for (const site of sites) {
+		// API
 		const buildInfo = await startSiteRender(site.id);
 		const { siteHash } = buildInfo;
 		const body = {
@@ -98,6 +107,13 @@ async function unpublishSites(sites: Array<Site>) {
 		};
 
 		await endSiteRender(site.id, body);
+
+		// STORE
+		// Remove site directory from the Store
+		fs.rmSync(path.join(__cx, "store", site.id.toString()), {
+			force: true,
+			recursive: true,
+		});
 	}
 }
 

package/exporter/utils/store.ts

@@ -8,7 +8,7 @@ import path from "node:path";
 
 import fsx from "fs-extra";
 
-import { getConfig, removeProperties, walk } from "./core-utils";
+import { getConfig, removeProperties, walk, walkStore } from "./core-utils";
 
 const config = getConfig();
 
@@ -43,7 +43,8 @@ function* getBuildPagesFromStore<PageType extends GriddoPageObject>(args?: {
 	const { basePath, withSizeProp } = args || {};
 	const { __cx } = config.paths();
 	const pagesDirPath = basePath || path.join(__cx, "store");
-	const jsonFilePaths = walk(pagesDirPath).filter(
+
+	const jsonFilePaths = walkStore(pagesDirPath).filter(
 		(file) => path.extname(file) === ".json",
 	);
 
@@ -185,22 +186,29 @@ function getPageInStoreDir(basePath: string): Array<number> {
  * Save the pages into the file system.
  * @param pages - An array of Griddo page objects to be saved.
  */
-function savePagesInStore(pages: Array<GriddoPageObject>) {
+function savePagesInStore(
+	siteFolderName: string,
+	pages: Array<GriddoPageObject>,
+) {
 	const { __cx } = config.paths();
 
-	pages.forEach((page) => {
-		removeProperties(page, ["editorID", "parentEditorID"]);
-		const filename = `${page.context.page.id}.json`;
-		const filePath = path.join(__cx, "store", filename);
-		fsx.writeJSONSync(filePath, page);
-	});
+	try {
+		pages.forEach((page) => {
+			removeProperties(page, ["editorID", "parentEditorID"]);
+			const filename = `${page.context.page.id}.json`;
+			const filePath = path.join(__cx, "store", siteFolderName, filename);
+			fsx.writeJSONSync(filePath, page);
+		});
+	} catch (e) {
+		console.log("ERROR", e);
+	}
 }
 
 /**
  * Remove files from dir.
  * @param filenames - An array of ids representing file page names.
  */
-function removePagesFromStore(filenames: Array<number>) {
+function removePagesFromStore(siteDirName: string, filenames: Array<number>) {
 	const { __cx } = config.paths();
 
 	if (filenames.length === 0) {
@@ -208,7 +216,7 @@ function removePagesFromStore(filenames: Array<number>) {
 	}
 
 	filenames.forEach((filename) => {
-		const filePath = path.join(__cx, "store", `${filename}.json`);
+		const filePath = path.join(__cx, "store", siteDirName, `${filename}.json`);
 		try {
 			fs.unlinkSync(filePath);
 		} catch (error) {
@@ -226,19 +234,22 @@ function removePagesFromStore(filenames: Array<number>) {
  * @param props.changedPages - Array of pages that have been modified in the site.
  * @returns - An object containing the pages to be created and deleted in the site.
  */
-async function getPagesToCreateOrDelete(
-	storeDir: string,
-	sitePages: {
-		sitesToPublish: Array<Site>;
-		pages: Array<number>;
-		validPagesIds: Array<number>;
-		changedPages: Array<number>;
-	},
-) {
-	const { changedPages, pages, validPagesIds, sitesToPublish } = sitePages;
+async function getPagesToCreateOrDelete(sitePages: {
+	sitesToPublish: Array<Site>;
+	validPagesIds: Array<number>;
+	changedPages: Array<number>;
+	siteDirName: string;
+}) {
+	const { __cx } = config.paths();
+	const storeDir = path.join(__cx, "store");
+
+	const { changedPages, validPagesIds, sitesToPublish, siteDirName } =
+		sitePages;
+
 	// Array<ids> de las páginas que están físicamente en el store en el
 	// site actual del bucle.
-	const pagesInStore = getPagesInStoreDirBySitePages(storeDir, pages);
+	const siteDirStorePath = path.join(storeDir, siteDirName);
+	const pagesInStore = getPageInStoreDir(siteDirStorePath);
 
 	// Array<ids> que están el `validPagesIds` pero no están por algún
 	// motivo en el store. Se incluyen porque deben ser creadas.
@@ -265,26 +276,26 @@ async function getPagesToCreateOrDelete(
 
 	// 1 - Leer el store
 	// 2 - eliminar las páginas que tengan como site uno despublicado o borrado
-	const allPagesInStore = getBuildPagesFromStore();
-
-	const pagesFromInvalidSites: Array<number> = [];
-	for await (const page of allPagesInStore) {
-		const pageSite = page.context.page.site;
-		const pageId = page.context.page.id!;
-		// Si el `site.id` de la página no es ninguno de los `sitesToPublish`
-		// añadimos la página a `pagesFromIvalidSites` para borrarla
-		// posteriormente.
-		if (!sitesToPublish.map((site) => site.id).includes(pageSite)) {
-			pagesFromInvalidSites.push(pageId);
-		}
-	}
+	// const allPagesInStore = getBuildPagesFromStore();
+
+	// const pagesFromInvalidSites: Array<number> = [];
+	// for await (const page of allPagesInStore) {
+	// 	const pageSite = page.context.page.site;
+	// 	const pageId = page.context.page.id!;
+	// 	// Si el `site.id` de la página no es ninguno de los `sitesToPublish`
+	// 	// añadimos la página a `pagesFromIvalidSites` para borrarla
+	// 	// posteriormente.
+	// 	if (!sitesToPublish.map((site) => site.id).includes(pageSite)) {
+	// 		pagesFromInvalidSites.push(pageId);
+	// 	}
+	// }
 
 	return {
 		pagesInStore,
 		pagesMissingInStore,
 		pagesToDeleteFromStore: [
 			...pagesToDeleteFromStore,
-			...pagesFromInvalidSites,
+			// ...pagesFromInvalidSites,
 		],
 		pagesToWriteToStore,
 	};

package/gatsby-node.ts

@@ -7,17 +7,22 @@ import {
 	getBuildPagesFromStore,
 	getConfig,
 	infoLog,
+	insertAlert,
 	pageSizeLog,
 	verboseLog,
+	debugLog,
 } from "./build";
+import { gatsbyRegister } from "./exporter/registers";
 
 const griddoBuildLogs = JSON.parse(process.env.GRIDDO_BUILD_LOGS || "false");
 const assetPrefixWithDomain = process.env.SPAWN_ASSET_PREFIX_WITH_DOMAIN;
+const sendAlertActive = JSON.parse(process.env.GRIDDO_ALERT_FEATURE || "false");
 const needsAssetDomainPrefix =
 	!!assetPrefixWithDomain && assetPrefixWithDomain !== "";
 
 const { __ssg } = getConfig().paths();
 const template = path.join(__ssg, "src/components/template.tsx");
+
 const pages = getBuildPagesFromStore<GatsbyPageObject>({
 	withSizeProp: griddoBuildLogs,
 });
@@ -38,14 +43,47 @@ const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
 
 		actions.createPage(page);
 
-		if (griddoBuildLogs) {
-			const path = page.path;
-			const id = page.context.id;
-			const size = pageSizeLog(Math.round(page.size || 0));
+		const path = page.path;
+		const id = page.context.id;
+		const size = pageSizeLog(Math.round(page.size || 0));
+
+		if (sendAlertActive && page.size) {
+			const pageMaxSizeReached =
+				page.size >
+				Number.parseInt(process.env.GRIDDO_SSG_MAX_PAGE_SIZE || "524288") /
+					1024;
+
+			if (pageMaxSizeReached) {
+				gatsbyRegister.insert("GATSBY_PAGE_SIZE_TOO_BIG", {
+					path: page.path,
+					size: `${Math.round(page.size)}KB`,
+				});
+			}
+		}
 
+		if (griddoBuildLogs) {
 			infoLog(`Creating page ${path} - ${id} - ${size}`);
 		}
 	}
+
+	if (sendAlertActive && gatsbyRegister.haveEntries()) {
+		const registerContent = gatsbyRegister.get("GATSBY_PAGE_SIZE_TOO_BIG");
+
+		debugLog("\nRender register report\n");
+		debugLog(registerContent);
+		debugLog();
+
+		insertAlert({
+			description: "Render register report",
+			area: "Griddo",
+			level: "W",
+			fullData: {
+				output: registerContent,
+				date: new Date().toISOString(),
+			},
+			instantNotification: false,
+		});
+	}
 };
 
 export { onCreateWebpackConfig } from "./src/gatsby-node-utils";

package/package.json

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