@griddo/cx 10.4.5 → 10.4.7

package/exporter/adapters/gatsby/index.ts

@@ -1,7 +1,7 @@
-import { getGatsbyDomainRunner } from "./utils";
+import { attempts, getGatsbyDomainRunner } from "./utils";
 import { getInstanceDomains } from "../../utils/domains";
 import { createBuildData } from "../../utils/download-build-data";
-import { clearEmptyDirs } from "../../utils/folders";
+import { clearEmptyDirs, removeMultiPagesFromStore } from "../../utils/folders";
 import { uploadSearchContentToAPI } from "../../utils/searches";
 import { doLifeCycle, pause, printExporterLogo } from "../../utils/shared";
 
@@ -20,6 +20,7 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "Restore",
+			attempts: attempts.restore,
 			steps: [
 				runner.init,
 				() => pause("init done!"),
@@ -38,9 +39,10 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "Data",
+			attempts: attempts.data,
 			steps: [
-				async () => await createBuildData(domain),
-				() => pause("Download data from API to `store` dir done!"),
+				() => createBuildData(domain),
+				() => pause("Download data from API to `store` done!"),
 			],
 		});
 
@@ -53,6 +55,7 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "SSG",
+			attempts: attempts.ssg,
 			steps: [runner.runGatsbyBuild, () => pause("Gatsby build done!")],
 		});
 
@@ -67,6 +70,7 @@ async function runGatsbyAdapter() {
 		);
 		await doLifeCycle({
 			name: "Meta",
+			attempts: attempts.meta,
 			steps: [
 				() => (shouldUploadSearchData ? uploadSearchContentToAPI() : undefined),
 			],
@@ -80,7 +84,13 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "Archive",
+			attempts: attempts.archive,
 			steps: [
+				// Elimina las páginas MultiPage del `store`. De este modo nos
+				// aseguramos que se vuelven a crear por Gatsby siempre
+				// actualizadas.
+				removeMultiPagesFromStore,
+				() => pause("MultiPages removed from `store`"),
 				() => clearEmptyDirs(),
 				() => pause("Clean empty dirs done!"),
 				runner.removeDisposableArtifacts,

package/exporter/adapters/gatsby/utils.ts

@@ -11,6 +11,20 @@ import { checkSites } from "../../utils/sites";
 
 dotenv.config();
 
+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 a runner, a serie of functions to manage the Gatsby render artifacts.
  */
@@ -317,17 +331,6 @@ function getGatsbyDomainRunner(domain: string) {
 		}
 	};
 
-	// TODO: Esto no debería hacerse desde infra
-	// const movePublicToDist = () => {
-	// 	const { currentExportWorkingPath: publicPath } = getArtifactPaths("public");
-	// 	const { currentExportWorkingPath: distPath } = getArtifactPaths("dist");
-
-	// 	if (fs.existsSync(publicPath)) {
-	// 		console.log(`Moving ${publicPath} to ${distPath}`);
-	// 		run(`mv ${publicPath} ${distPath}`);
-	// 	}
-	// };
-
 	/**
 	 * Delete disposable artifacts between renders.
 	 */
@@ -344,11 +347,6 @@ function getGatsbyDomainRunner(domain: string) {
 		}
 	};
 
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	const cleanAfterFail = () => {
-		cleanDirtyArtifactPaths();
-	};
-
 	return {
 		init,
 		getArtifactPaths,
@@ -379,4 +377,5 @@ function getGatsbyAssetPrefixSlug(domain: string) {
 	return `${assetPrefix}/${domain}`;
 }
 
-export { getGatsbyDomainRunner };
+export { attempts, getGatsbyDomainRunner };
+

package/exporter/utils/folders.ts

@@ -7,6 +7,7 @@ import path from "node:path";
 import fs from "fs-extra";
 
 import { CXRootDir, instanceRootDir, logInfo } from "./shared";
+import { getPageInStoreDir, removePagesFromStore } from "./store";
 // eslint-disable-next-line node/no-unpublished-import
 import config from "../../cx.config";
 
@@ -318,10 +319,26 @@ function createBackup(src: string, suffix = "-BACKUP") {
 	}
 }
 
+function isMultiPageId(id: number) {
+	return Number.isInteger(id) && id < 0;
+}
+
+function removeMultiPagesFromStore() {
+	const dirs = config.dirs("");
+	const storePath = path.join(dirs.__cx, "store");
+	try {
+		const multiPageFiles = getPageInStoreDir(storePath).filter(isMultiPageId);
+		removePagesFromStore(storePath, multiPageFiles);
+	} catch (e) {
+		console.info("`store` folder does not exist. Skipping multipage clean up.");
+	}
+}
+
 export {
 	clearEmptyDirs,
 	copyArtifacts,
 	deleteSites,
 	moveArtifacts,
 	removeArtifacts,
+	removeMultiPagesFromStore,
 };

package/exporter/utils/pages.ts

@@ -269,11 +269,7 @@ async function createGriddoListPages(
 			defaultLang,
 		};
 
-		return await createGriddoPageObject(
-			paginatedPage,
-			additionalInfo,
-			!isFirstPage
-		);
+		return await createGriddoPageObject(paginatedPage, additionalInfo);
 	});
 
 	return Promise.all(allPages);
@@ -302,7 +298,7 @@ function createGriddoMultiPages(
 	}
 
 	// Creates each page based on `multiPageElements` from the schema.
-	const allPages = multiPageElements.map(async (pageElement) => {
+	const allPages = multiPageElements.map(async (pageElement, idx) => {
 		// TODO: Use structuredClone() when node 18 is available.
 		const paginatedPage: APIPageObject = JSON.parse(JSON.stringify(cleanPage));
 		const {
@@ -334,6 +330,17 @@ function createGriddoMultiPages(
 			paginatedPage.metaDescription = metaDescription;
 		}
 
+		// Crea un id como número negativo y añadiendo un sufijo para las multipages.
+		// Esto es así para marcarlas y posteriormente borrarlas siempre en cada
+		// nuevo render desde el Adapter.
+		//
+		// id de página con hasMultipageTrue: 1546
+		// ids de las "sub-páginas": -15460, -15461, -1546n, (-)id(idx)
+		//
+		// @todo eliminar el concepto multipage de CX, debería ser algo core de
+		// Griddo itself: API/AX, que fuesen páginas con sus ids, etc..
+		paginatedPage.id = parseInt("-" + paginatedPage.id + idx);
+
 		paginatedPage.fullUrl = `${fullUrl}/${rightSectionSlug}`;
 		paginatedPage.fullPath.compose = newCompose;
 		paginatedPage.slug = newCompose;

package/exporter/utils/runners.ts

@@ -41,12 +41,11 @@ function runner(command: string, env: Env) {
 
 	if (error) {
 		console.error(error);
-		process.exit(1);
+		throw new Error(error.toString());
 	}
 
 	if (status !== 0) {
-		console.error(`Command \`${command}\` exited with code ${status}`);
-		process.exit(1);
+		throw new Error(`Command \`${command}\` exited with code ${status}`);
 	}
 }
 

package/exporter/utils/shared.ts

@@ -327,8 +327,7 @@ async function doLifeCycle(args: {
 }) {
 	const { steps, name, attempts } = args;
 	let trysCount = 0;
-	const maxTrysAccepted =
-		Number(process.env.GRIDDO_LIFECYCLE_MAX_RETRY_ATTEMPTS) || attempts || 1;
+	const maxTrysAccepted = attempts || 1;
 
 	while (trysCount < maxTrysAccepted) {
 		try {

package/exporter/utils/store.ts

@@ -243,6 +243,7 @@ export {
 	createStoreDir,
 	getBuildMetadata,
 	getBuildPages,
+	getPageInStoreDir,
 	getPagesToCreateOrDelete,
 	removePagesFromStore,
 	savePagesInStore,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.5",
+	"version": "10.4.7",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -47,22 +47,16 @@
 		"babel-plugin-styled-components": "^1.10.7",
 		"babel-plugin-transform-runtime": "^6.23.0",
 		"babel-polyfill": "^6.26.0",
-		"branch-name": "^1.0.0",
 		"chalk": "^2.4.2",
-		"csvtojson": "^2.0.10",
 		"dotenv": "^8.1.0",
 		"find-up": "^5.0.0",
 		"fs-extra": "^9.0.1",
 		"gatsby": "^4.8.0",
-		"gatsby-plugin-polyfill-io": "^1.1.0",
 		"gatsby-plugin-react-helmet": "^5.8.0",
-		"gatsby-plugin-sass": "^5.21.0",
-		"gatsby-plugin-styled-components": "^5.8.0",
 		"gatsby-plugin-svgr-loader": "^0.1.0",
 		"gradient-string": "^2.0.2",
 		"html-react-parser": "^1.4.10",
 		"js2xmlparser": "^4.0.1",
-		"opn": "^6.0.0",
 		"p-limit": "^3.0.0",
 		"path-browserify": "^1.0.1",
 		"pkg-dir": "^5.0.0",
@@ -70,10 +64,6 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^10.4.5",
-		"@types/babel__core": "^7.20.0",
-		"@types/babel__preset-env": "^7.9.2",
-		"@types/csvtojson": "^2.0.0",
 		"@types/eslint": "^7.29.0",
 		"@types/fs-extra": "^9.0.13",
 		"@types/gradient-string": "^1.1.2",
@@ -117,5 +107,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7bf57f5c59f846056de127fc1bf85cc5b93fc21b"
+	"gitHead": "0280c78de79a2b1f534c9aaaf16e6bb72bd5b652"
 }