@griddo/cx 10.4.6 → 10.4.8

package/exporter/adapters/gatsby/index.ts

@@ -1,4 +1,4 @@
-import { getGatsbyDomainRunner } from "./utils";
+import { attempts, getGatsbyDomainRunner } from "./utils";
 import { getInstanceDomains } from "../../utils/domains";
 import { createBuildData } from "../../utils/download-build-data";
 import { clearEmptyDirs, removeMultiPagesFromStore } from "../../utils/folders";
@@ -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,11 +84,12 @@ 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, // penalizando optimización...
+				removeMultiPagesFromStore,
 				() => pause("MultiPages removed from `store`"),
 				() => clearEmptyDirs(),
 				() => pause("Clean empty dirs done!"),

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/types/global.ts

@@ -95,8 +95,10 @@ interface CXConfig {
 		CACHE: "__cache";
 		CX: "__cx";
 		SSG: "__ssg";
+		COMPONENTS: "__components";
+		ROOT: "__root";
 	};
-	dirs: (domain: string) => Record<CXDir, string>;
+	dirs: (domain?: string) => Record<CXDir, string>;
 }
 
 export {

package/exporter/utils/folders.ts

@@ -4,12 +4,11 @@ import type { Site } from "../types/sites";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 
-import fs from "fs-extra";
+import fsx 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";
+import { getConfig } from "./temp-utils";
 
 export const STORE_DIR = path.resolve(__dirname, "../store/");
 export const DIST_DIR = path.resolve(__dirname, "../dist/");
@@ -45,19 +44,19 @@ async function deleteSites(updatedSites: Array<Site>, DOMAIN: string) {
 			logInfo(`Page data dir ${pageDataDir}`);
 
 			// delete directory recursively
-			if (!fs.existsSync(siteDir)) continue;
+			if (!fsx.existsSync(siteDir)) continue;
 
 			try {
-				await fs.rm(siteDir, { recursive: true });
+				await fsx.rm(siteDir, { recursive: true });
 				logInfo(`${siteDir} was deleted!`);
 			} catch (err) {
 				console.log(err);
 			}
 
-			if (!fs.existsSync(pageDataDir)) continue;
+			if (!fsx.existsSync(pageDataDir)) continue;
 
 			try {
-				await fs.rm(pageDataDir, { recursive: true });
+				await fsx.rm(pageDataDir, { recursive: true });
 				console.info(`${pageDataDir} was deleted!`);
 			} catch (err) {
 				console.log(err);
@@ -72,13 +71,13 @@ async function deleteSites(updatedSites: Array<Site>, DOMAIN: string) {
 const clearEmptyDirs = (baseDir?: string) => {
 	const dir = baseDir || path.resolve(CXRootDir, "dist");
 
-	const isDir = fs.statSync(dir).isDirectory();
+	const isDir = fsx.statSync(dir).isDirectory();
 	if (!isDir) {
 		return;
 	}
 
 	// archivos o direvtorios dentro de `dir`
-	let children = fs.readdirSync(dir);
+	let children = fsx.readdirSync(dir);
 	// let children = childrenRaw.filter((file) => {
 	// 	return path.extname(file).toLowerCase() !== ".xml";
 	// });
@@ -97,9 +96,9 @@ const clearEmptyDirs = (baseDir?: string) => {
 		if (childrenCount === xmlCount) {
 			children.forEach(function (xmlFile) {
 				const fullPath = path.join(dir, xmlFile);
-				fs.rmSync(fullPath);
+				fsx.rmSync(fullPath);
 			});
-			children = fs.readdirSync(dir);
+			children = fsx.readdirSync(dir);
 		}
 
 		children.forEach(function (file) {
@@ -109,12 +108,12 @@ const clearEmptyDirs = (baseDir?: string) => {
 
 		// re-evaluate files; after deleting subdir we may have parent dir
 		// empty now...
-		children = fs.readdirSync(dir);
+		children = fsx.readdirSync(dir);
 	}
 
 	// Si no tiene hijos, lo borramos
 	if (children.length === 0) {
-		fs.rmdirSync(dir);
+		fsx.rmdirSync(dir);
 		return;
 	}
 };
@@ -137,6 +136,7 @@ async function copyArtifacts(args: {
 }) {
 	const { artifacts, domain, from, to, withBackup } = args;
 
+	const config = await getConfig();
 	const dirs = config.dirs(domain);
 
 	for (const artifact of artifacts) {
@@ -144,7 +144,7 @@ async function copyArtifacts(args: {
 		const dest = path.join(dirs[to], artifact);
 
 		// The dir we want to copy, doesn't exist.
-		if (!fs.existsSync(src)) {
+		if (!fsx.existsSync(src)) {
 			console.log(`Source directory does not exist: ${src}`);
 			continue;
 		}
@@ -157,7 +157,7 @@ async function copyArtifacts(args: {
 		// Copy artifact
 		try {
 			// First clean destination
-			if (fs.existsSync(dest)) {
+			if (fsx.existsSync(dest)) {
 				spawnSync("rm", ["-rf", dest]);
 			}
 			spawnSync("cp", ["-Rp", src, dest]);
@@ -198,7 +198,7 @@ async function copyArtifacts(args: {
  * // with backup
  * moveArtifacts({domain: domain, from: "__cx", to: "__ssg", ["dist"]})
  */
-function moveArtifacts(args: {
+async function moveArtifacts(args: {
 	domain: string;
 	from: CXDir;
 	to: CXDir;
@@ -207,6 +207,7 @@ function moveArtifacts(args: {
 }) {
 	const { artifacts, domain, from, to, withBackup } = args;
 
+	const config = await getConfig();
 	const dirs = config.dirs(domain);
 
 	for (const artifact of artifacts) {
@@ -214,7 +215,7 @@ function moveArtifacts(args: {
 		const dest = path.join(dirs[to], artifact);
 
 		// The dir we want to move, doesn't exist.
-		if (!fs.existsSync(src)) {
+		if (!fsx.existsSync(src)) {
 			console.log(`Source directory does not exist: ${src}`);
 			continue;
 		}
@@ -225,7 +226,7 @@ function moveArtifacts(args: {
 
 		try {
 			// First clean destination
-			if (fs.existsSync(dest)) {
+			if (fsx.existsSync(dest)) {
 				spawnSync("rm", ["-rf", dest]);
 			}
 			spawnSync("mv", [src, dest]);
@@ -253,19 +254,20 @@ function moveArtifacts(args: {
  * @example
  * removeArtifacts(domain, "__cx", "__ssg", ["dist"], ["public"])
  */
-function removeArtifacts(args: {
+async function removeArtifacts(args: {
 	domain: string;
 	from: CXDir;
 	artifacts: Array<string>;
 }) {
 	const { artifacts, domain, from } = args;
 
+	const config = await getConfig();
 	const dirs = config.dirs(domain);
 
 	for (const artifact of artifacts) {
 		if (artifact) {
 			const src = path.join(dirs[from], artifact);
-			if (fs.existsSync(src)) {
+			if (fsx.existsSync(src)) {
 				spawnSync("rm", ["-rf", src]);
 			}
 		}
@@ -285,7 +287,7 @@ function restoreBackup(src: string, suffix = "-BACKUP") {
 function deleteBackup(src: string, suffix = "-BACKUP") {
 	const dest = src + suffix;
 
-	if (!fs.existsSync(dest)) {
+	if (!fsx.existsSync(dest)) {
 		console.log(`Source ${dest} does not exist`);
 		return;
 	}
@@ -301,12 +303,12 @@ function deleteBackup(src: string, suffix = "-BACKUP") {
 function createBackup(src: string, suffix = "-BACKUP") {
 	const dest = src + suffix;
 
-	if (!fs.existsSync(src)) {
+	if (!fsx.existsSync(src)) {
 		console.log(`Source ${src} does not exist`);
 		return;
 	}
 
-	if (fs.existsSync(dest)) {
+	if (fsx.existsSync(dest)) {
 		console.log(`Destination ${dest} already exists`);
 		return;
 	}
@@ -323,8 +325,9 @@ function isMultiPageId(id: number) {
 	return Number.isInteger(id) && id < 0;
 }
 
-function removeMultiPagesFromStore() {
-	const dirs = config.dirs("");
+async function removeMultiPagesFromStore() {
+	const config = await getConfig();
+	const dirs = config.dirs();
 	const storePath = path.join(dirs.__cx, "store");
 	try {
 		const multiPageFiles = getPageInStoreDir(storePath).filter(isMultiPageId);

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/temp-utils.ts

@@ -0,0 +1,13 @@
+async function getConfig() {
+	try {
+		// eslint-disable-next-line node/no-unpublished-import
+		const configModule = await import("../../cx.config");
+		const config = configModule.default;
+
+		return config;
+	} catch (error) {
+		process.exit(1);
+	}
+}
+
+export { getConfig };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.6",
+	"version": "10.4.8",
 	"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.6",
-		"@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": "bf836216af29607748b79d098210379423c6914f"
+	"gitHead": "1390ad1d87acd73442f46bed3f505df9b6fd4adc"
 }