@griddo/cx 10.4.7 → 10.4.8

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/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.7",
+	"version": "10.4.8",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -107,5 +107,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0280c78de79a2b1f534c9aaaf16e6bb72bd5b652"
+	"gitHead": "1390ad1d87acd73442f46bed3f505df9b6fd4adc"
 }