@griddo/cx 10.4.20 → 10.4.21

package/exporter/adapters/gatsby/index.ts

@@ -1,8 +1,7 @@
-import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 
-import { attempts, getGatsbyAssetPrefixSlug } from "./utils";
+import { attempts, gatsbyBuild, getGatsbyAssetPrefixSlug } from "./utils";
 import { RobotsService } from "../../services/robots";
 import { createBuildData } from "../../utils/create-build-data";
 import { getInstanceDomains } from "../../utils/domains";
@@ -120,27 +119,7 @@ async function runGatsbyAdapter() {
 		await doLifeCycle({
 			name: "SSG",
 			attempts: attempts.ssg,
-			steps: [
-				() => {
-					// Run Gatsby
-					const render = spawnSync("yarn", ["gatsby-build"], {
-						cwd: __ssg,
-						stdio: ["ignore", "inherit", "ignore"],
-						encoding: "utf8",
-						shell: true,
-						env: Object.assign(process.env, {
-							GRIDDO_EXPORTER: "true",
-							GRIDDO_ASSET_PREFIX: assetPrefix,
-						}),
-					});
-
-					// @todo gestionar esto desde doLifeCycle.
-					if (render.status !== 0) {
-						throw new Error("Error in 'yarn gatsby-build'");
-					}
-				},
-				() => pause("SSG LifeCycle"),
-			],
+			steps: [() => gatsbyBuild(domain), () => pause("SSG LifeCycle")],
 		});
 
 		/*
@@ -148,6 +127,7 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "Relocation",
+			attempts: attempts.relocation,
 			steps: [
 				() => legacy__createDistFromGatsbyPublic(domain, needsAssetPrefix),
 				() => pause("Relocation LifeCycle"),
@@ -201,11 +181,11 @@ async function runGatsbyAdapter() {
 		 */
 		await doLifeCycle({
 			name: "Clean",
+			attempts: attempts.clean,
 			steps: [
 				() => removeDirsSync(__ssg, ["static", "public", "dist"]),
 				() => pause("Clean LifeCycle"),
 			],
-			attempts: attempts.clean,
 		});
 	}
 }

package/exporter/adapters/gatsby/utils.ts

@@ -1,3 +1,5 @@
+import { spawnSync } from "node:child_process";
+
 import { Fields } from "@griddo/core";
 import dotenv from "dotenv";
 
@@ -5,6 +7,8 @@ import { getConfig } from "../../utils/temp-utils";
 
 dotenv.config();
 
+const config = getConfig();
+
 const attempts = {
 	prepare: JSON.parse(process.env.GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS || "1"),
 	restore: JSON.parse(process.env.GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS || "1"),
@@ -82,4 +86,24 @@ function addCloudinaryParams(image: string, params: string) {
 	return `https://${head}/${params}${fullId}`;
 }
 
-export { attempts, formatImage, getGatsbyAssetPrefixSlug };
+function gatsbyBuild(domain: string) {
+	const assetPrefix = getGatsbyAssetPrefixSlug(domain);
+	const { __ssg } = config.paths();
+
+	const command = spawnSync("yarn", ["gatsby-build"], {
+		cwd: __ssg,
+		stdio: ["ignore", "inherit", "ignore"],
+		encoding: "utf8",
+		shell: true,
+		env: Object.assign(process.env, {
+			GRIDDO_EXPORTER: "true",
+			LOCAL_GRIDDO_ASSET_PREFIX: assetPrefix,
+		}),
+	});
+
+	if (command.status !== 0) {
+		throw new Error("Error in 'yarn gatsby-build'");
+	}
+}
+
+export { attempts, formatImage, gatsbyBuild, getGatsbyAssetPrefixSlug };

package/exporter/errors/index.ts

@@ -0,0 +1,2 @@
+// noop
+export const noop = true;

package/exporter/start-render.ts

@@ -5,8 +5,7 @@ import { runGatsbyAdapter } from "./adapters";
 import { logBox, measureExecutionTime } from "./utils/shared";
 
 async function startRender() {
-	const exeTime = await measureExecutionTime(runGatsbyAdapter).catch((e) => {
-		console.log(e);
+	const exeTime = await measureExecutionTime(runGatsbyAdapter).catch(() => {
 		console.log("<[ Render will be reset ]>");
 		process.exit(1);
 	});

package/exporter/utils/shared.ts

@@ -346,7 +346,12 @@ async function doLifeCycle(args: {
 			// if no errors, go out!! :)
 			break;
 		} catch (error) {
-			console.log(`Error in ${name}. Attempt (${trysCount + 1})`);
+			const errorString = chalk.bgRed.black(` Error in ${name} LifeCycle `);
+			const attemptsString = chalk.yellow(`Attempt (${trysCount + 1})`);
+			console.log(`\n${errorString} ${attemptsString}\n`);
+			console.log(error);
+			console.log();
+
 			trysCount++;
 		}
 	}

package/gatsby-config.ts

@@ -8,7 +8,7 @@ dotenv.config();
 
 // Este process.env.GRIDDO_ASSET_PREFIX se lee porque se ha introducido en
 // `getEnvRunner()`.
-const GRIDDO_ASSET_PREFIX = process.env.GRIDDO_ASSET_PREFIX || undefined;
+const GRIDDO_ASSET_PREFIX = process.env.LOCAL_GRIDDO_ASSET_PREFIX || undefined;
 
 // Gatsby configuration file from client
 // eslint-disable-next-line @typescript-eslint/no-var-requires

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.20",
+	"version": "10.4.21",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -45,7 +45,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^10.4.20",
+		"@griddo/core": "^10.4.21",
 		"@svgr/webpack": "^5.5.0",
 		"@types/cheerio": "^0.22.35",
 		"babel-loader": "^8.0.6",
@@ -120,5 +120,5 @@
 	"resolutions": {
 		"memoizee": "0.4.15"
 	},
-	"gitHead": "8e355cb3ed943e2677b8b4065c148e30220e0958"
+	"gitHead": "e9ee5308a0c6829e0e3c0c82d28f5e580d0bb804"
 }

package/src/gatsby-node-utils.ts

@@ -83,9 +83,20 @@ function getGatsbyAssetPrefixSlug(domain: string) {
 	return `${assetPrefix}/${domain}`;
 }
 
+// @todo: Arreglar esta movida de variables de entorno locales solo para Gatsby
+function getLocalGatsbyAssetPrefixSlug(domain: string) {
+	const { proDomain } = getConfig();
+
+	const assetPrefix = process.env.LOCAL_GRIDDO_ASSET_PREFIX;
+	if (!assetPrefix || !domain) return "";
+	if (!domain.startsWith(proDomain)) return "";
+
+	return `${assetPrefix}/${domain}`;
+}
+
 function getMatchPath(domain: string, compose: string) {
 	const domainWithNoSlashes = domain.replace("/", "");
-	const assetPrefix = getGatsbyAssetPrefixSlug(domainWithNoSlashes);
+	const assetPrefix = getLocalGatsbyAssetPrefixSlug(domainWithNoSlashes);
 	const needsAssetDomainPrefix = assetPrefix && assetPrefix !== "";
 	const matchPath = needsAssetDomainPrefix ? compose : "";