@griddo/cx 1.75.227 → 1.75.228

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.227",
+	"version": "1.75.228",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -68,7 +68,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.227",
+		"@griddo/eslint-config-back": "^1.75.228",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -116,5 +116,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fd5fee42aaf938991fd8d51f24eecbe740c65cc4"
+	"gitHead": "c0187f02712eadfb4a2f7632180a4276c126ef91"
 }

package/scripts/build-complete.ts

@@ -8,7 +8,7 @@ import { SitesService } from "../src/services/sites";
 import { logInfo } from "../src/utils/shared";
 
 // Where we are going to find export folders
-const execBasePath = pkgDir.sync()!;
+const execBasePath = pkgDir.sync(path.resolve(__dirname, "../.."))!;
 
 // Where we are going to find archived exports
 const exportArchiveBasePath = path.resolve(execBasePath, "exports/sites");

package/scripts/griddo-exporter.ts

@@ -18,27 +18,32 @@ import { exporterLogo as splash, measureFunctions } from "../src/utils/shared";
 dotenv.config();
 
 // Envs
-const artifactsArchivable = ["dist", "assets", "apiCache"];
+// Artifacts to preserve between CX installs
+const artifactsArchivable = ["dist", "assets"];
+// Artifacts to remove after export
 const artifactsDisposable = ["public", ".store"];
-
-// TODO: Remove GRIDDO_INFRA_BUILD_COMPLETES behaviour when all instances are over 1.75.227 and infra calls export:complete
-const INFRA_COMPLETES_BUILD = !!process.env.GRIDDO_INFRA_BUILD_COMPLETES;
+// Artifacts to make exports faster
+const artifactsCache = ["apiCache" /* , ".cache" */];
 
 // TODO: Remove STRIP_DOMAIN_FROM_PATH behaviour when all instances are over 1.75.219
 const STRIP_DOMAIN_FROM_PATH =
 	!!process.env.GRIDDO_EXPORT_STRIP_DOMAIN_FROM_PATH;
 
 if (STRIP_DOMAIN_FROM_PATH) {
-	artifactsArchivable.push(".cache");
+	artifactsCache.push(".cache");
 } else {
 	artifactsDisposable.push(".cache");
 }
 
+// TODO: Remove GRIDDO_INFRA_BUILD_COMPLETES behaviour when all instances are over 1.75.227 and infra calls export:complete
+const INFRA_COMPLETES_BUILD = !!process.env.GRIDDO_INFRA_BUILD_COMPLETES;
+
 // Where we are going to find export folders
 const execBasePath = pkgDir.sync()!;
 
 // Where we are going to find archived exports
 const exportArchiveBasePath = path.resolve(execBasePath, "exports/sites");
+const exportCachesArchivePath = path.resolve(__dirname, "../caches");
 
 // Where we are going to run the export command
 const workingPath = pkgDir.sync(__dirname)!;
@@ -89,32 +94,39 @@ const logWarning = (...message: Array<any>) => console.log(...message);
 const domainExport = async (domain: string) => {
 	const runner = getDomainRunner(domain);
 	// onPreExporter
-	const endRestore = measureFunctions(runner.init, runner.restoreArtifacts);
-	logInfo(`\n⌛️ Domain ${domain} restaured: ${endRestore}s`);
+	const endRestore = measureFunctions(
+		runner.init,
+		runner.restoreArtifacts,
+		runner.restoreCacheArtifacts
+	);
+	logInfo(`\n⌛️ Domain ${domain} restored: ${endRestore}s`);
 
 	// Gatsby
 	runner.runExporter();
 
 	// onPostExporter
-	const endArchive = measureFunctions(runner.archiveArtifacts);
+	const endArchive = measureFunctions(
+		runner.archiveArtifacts,
+		runner.archiveCacheArtifacts
+	);
 	logInfo(`\n⌛️ Domain ${domain} archived: ${endArchive}s`);
 };
 
 const launchExports = async () => {
 	splash();
-	initCache();
+	// initCache();
 
-	const domains = await findDomains();
+	// const domains = await findDomains();
 
-	for (const domain of domains) {
-		logInfo(`️🚢 Exporting domain ${chalk.underline(domain)}`);
-		await domainExport(domain);
-	}
+	// for (const domain of domains) {
+	// 	logInfo(`️🚢 Exporting domain ${chalk.underline(domain)}`);
+	// 	await domainExport(domain);
+	// }
 
 	// TODO: Remove when all instances are over 1.75.227 and infra calls export:complete
 	if (!INFRA_COMPLETES_BUILD) {
 		const runner = getEnvRunner({ cwd: __dirname });
-		runner("yarn export:complete");
+		runner("pwd; ls; node ./build/build-complete.js");
 	}
 };
 
@@ -136,6 +148,10 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const getArtifactPaths = (artifact = "") => {
+		if (artifact === "/")
+			throw new Error(`Artifact path cannot be root: ${artifact}`);
+
+		// Archives
 		const domainExportArchiveBasePath = path.resolve(
 			exportArchiveBasePath,
 			domain
@@ -148,6 +164,21 @@ const getDomainRunner = (domain: string) => {
 			currentExportArchivePath,
 			domain
 		);
+
+		// Cachés
+		const domainCacheArchiveBasePath = path.resolve(
+			exportCachesArchivePath,
+			domain
+		);
+		const currentExportArchiveCachePath = path.resolve(
+			domainCacheArchiveBasePath,
+			artifact
+		);
+		const currentExportArchiveCachePathInDomain = path.resolve(
+			currentExportArchiveCachePath,
+			domain
+		);
+
 		const currentExportBackupPath = `${currentExportArchivePath}-BACKUP`;
 		const currentExportWorkingPath = path.resolve(workingPath, artifact);
 
@@ -157,11 +188,18 @@ const getDomainRunner = (domain: string) => {
 			currentExportBackupPath,
 			currentExportWorkingPath,
 			currentExportArchivePathInDomain,
+			domainCacheArchiveBasePath,
+			currentExportArchiveCachePath,
+			currentExportArchiveCachePathInDomain,
 		};
 	};
 
 	const cleanDirtyArtifactPaths = () => {
-		for (const artifact of [...artifactsArchivable, ...artifactsDisposable]) {
+		for (const artifact of [
+			...artifactsArchivable,
+			...artifactsDisposable,
+			...artifactsCache,
+		]) {
 			const { currentExportWorkingPath } = getArtifactPaths(artifact);
 
 			if (fs.existsSync(currentExportWorkingPath)) {
@@ -172,11 +210,17 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const createBaseExportPaths = () => {
-		const { domainExportArchiveBasePath } = getArtifactPaths();
+		const { domainExportArchiveBasePath, domainCacheArchiveBasePath } =
+			getArtifactPaths();
 
-		if (!fs.existsSync(domainExportArchiveBasePath)) {
-			logInfo(`✨ Creating ${domainExportArchiveBasePath}`);
-			run(`mkdir -p ${domainExportArchiveBasePath}`);
+		for (const _path of [
+			domainExportArchiveBasePath,
+			domainCacheArchiveBasePath,
+		]) {
+			if (!fs.existsSync(_path)) {
+				logInfo(`✨ Creating ${_path}`);
+				run(`mkdir -p ${_path}`);
+			}
 		}
 	};
 
@@ -264,6 +308,39 @@ const getDomainRunner = (domain: string) => {
 		run(`rm -rf ${currentExportBackupPath}`);
 	};
 
+	const archiveCacheArtifacts = () => {
+		for (const artifact of artifactsCache) {
+			const { currentExportArchiveCachePath, currentExportWorkingPath } =
+				getArtifactPaths(artifact);
+
+			if (fs.existsSync(currentExportWorkingPath)) {
+				logInfo(
+					`🚚 Moving files from ${chalk.gray(
+						currentExportWorkingPath
+					)} to ${chalk.gray(currentExportArchiveCachePath)}`
+				);
+				run(`mv ${currentExportWorkingPath} ${currentExportArchiveCachePath}`);
+			} else {
+				throw new Error(
+					`🚚 Error moving files from ${currentExportWorkingPath}: Path does not exist.`
+				);
+			}
+		}
+	};
+	const restoreCacheArtifacts = () => {
+		for (const artifact of artifactsCache) {
+			const { currentExportArchiveCachePath, currentExportWorkingPath } =
+				getArtifactPaths(artifact);
+
+			if (fs.existsSync(currentExportArchiveCachePath)) {
+				logWarning(
+					`️♻️  Restoring ${chalk.gray(currentExportArchiveCachePath)}`
+				);
+				run(`mv ${currentExportArchiveCachePath} ${currentExportWorkingPath}`);
+			}
+		}
+	};
+
 	const runExporter = () => {
 		console.log(`\n${chalk.black(chalk.bgGreen(" Gatsby (start) "))}\n`);
 
@@ -326,6 +403,8 @@ const getDomainRunner = (domain: string) => {
 		createArtifactBackup,
 		restoreArtifactBackup,
 		deleteArtifactBackup,
+		archiveCacheArtifacts,
+		restoreCacheArtifacts,
 		runExporter,
 	};
 };