@griddo/cx 1.75.213 → 1.75.215

package/build/index.js

@@ -25,7 +25,7 @@ GFS4: `),console.error(e)});G[Q]||(ea=global[Q]||[],ra(G,ea),G.close=function(e)
 \u2502 Access credentials failure                                 \u2502
 \u2502 Check that the login details are correct in your .env file \u2502
 \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F
-`)),process.exit(1)}}},hr=new On;var Yu=Y(Rn()),Xu=Y(mt()),Ku=Y(Gt());var lp=Y(mt()),Uu=Y(Gt()),fp=Y(eu()),Gu=Y($u());var Hu="1.75.213";Uu.default.config();var hp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);function zu(...e){hp&&console.info(...e)}function Wu(e){return new Promise(t=>setTimeout(t,e))}function ai(e,t=3){return(e/1e3).toFixed(t)}function Ju(e){return"site"in e&&e.site?e?.site:void 0}function ci(...e){let t=performance.now();return e.forEach(r=>r()),ai(performance.now()-t)}function Vu(){let e=`
+`)),process.exit(1)}}},hr=new On;var Yu=Y(Rn()),Xu=Y(mt()),Ku=Y(Gt());var lp=Y(mt()),Uu=Y(Gt()),fp=Y(eu()),Gu=Y($u());var Hu="1.75.215";Uu.default.config();var hp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)||!!process.env.LOGS&&!!JSON.parse(process.env.LOGS);function zu(...e){hp&&console.info(...e)}function Wu(e){return new Promise(t=>setTimeout(t,e))}function ai(e,t=3){return(e/1e3).toFixed(t)}function Ju(e){return"site"in e&&e.site?e?.site:void 0}function ci(...e){let t=performance.now();return e.forEach(r=>r()),ai(performance.now()-t)}function Vu(){let e=`
 \xB7\xB7
 \xB7\xB7
 \xB7\xB7
@@ -57,7 +57,7 @@ ${p}
 ${y}
 
 =============
-`))}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await Zu({endpoint:t})}};async function el(){await hr.login();let e=await Dr.getAll();return vp(e)}function vp(e){let t=e.filter(({slug:r})=>!!r).map(({slug:r})=>r.replace("/",""));return[...new Set(t)]}il.default.config();var ui=["dist","assets","apiCache"],tl=["public","store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),sl=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,nl.execSync)(e,{cwd:sl,stdio:"inherit",env:{...process.env,...t,GRIDDO_EXPORTER:"true"}}),Ep=e=>!process.env.GRIDDO_ASSET_PREFIX||!e||!e.startsWith("pro-")?"":`${process.env.GRIDDO_ASSET_PREFIX}/${e}`,rl=(...e)=>console.log(...e),Ge=(...e)=>console.log(...e),Sp=(...e)=>console.log(...e),Ue=(...e)=>console.log(...e),kp=async e=>{let t=Rp(e),r=ci(t.init,t.restoreArtifacts);Ge(`
+`))}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await Zu({endpoint:t})}};async function el(){await hr.login();let e=await Dr.getAll();return vp(e)}function vp(e){let t=e.filter(({slug:r})=>!!r).map(({slug:r})=>r.replace("/",""));return[...new Set(t)]}il.default.config();var ui=["dist","assets","apiCache"],tl=["public","store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),sl=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,nl.execSync)(e,{cwd:sl,stdio:"inherit",env:{...process.env,...t,GRIDDO_EXPORTER:"true"}}),Ep=e=>!(process.env.GRIDDO_ASSET_PREFIX||process.env.ASSET_PREFIX)||!e||!e.startsWith("pro-")?"":`${process.env.GRIDDO_ASSET_PREFIX||process.env.ASSET_PREFIX}/${e}`,rl=(...e)=>console.log(...e),Ge=(...e)=>console.log(...e),Sp=(...e)=>console.log(...e),Ue=(...e)=>console.log(...e),kp=async e=>{let t=Rp(e),r=ci(t.init,t.restoreArtifacts);Ge(`
 \u231B\uFE0F Domain ${e} restaured: ${r}s`),t.runExporter();let n=ci(t.archiveArtifacts);Ge(`
 \u231B\uFE0F Domain ${e} archived: ${n}s`)},Cp=async()=>{Vu(),us();let e=await el();for(let t of e)Ge(`\uFE0F\u{1F6A2} Exporting domain ${Z.default.underline(t)}`),await kp(t)},Rp=e=>{let t=Ep(e),r=_p({DOMAIN:e,GRIDDO_ASSET_PREFIX:t,HAS_ASSET_DOMAIN:t&&t!=="",RENDERID:new Date().valueOf()}),n=()=>{Ge(`\u{1F680} Initializing ${Z.default.underline(e)} exporter`),s(),o()},i=(S="")=>{let C=It.default.resolve(wp,e),P=It.default.resolve(C,S),J=`${P}-BACKUP`,de=It.default.resolve(sl,S);return{domainExportArchiveBasePath:C,currentExportArchivePath:P,currentExportBackupPath:J,currentExportWorkingPath:de}},s=()=>{for(let S of[...ui,...tl]){let{currentExportWorkingPath:C}=i(S);Se.default.existsSync(C)&&(Ue(`\u{1F9F9} Cleanup dirty ${Z.default.gray(C)}`),r(`rm -rf ${C}`))}},o=()=>{let{domainExportArchiveBasePath:S}=i();Se.default.existsSync(S)||(Ge(`\u2728 Creating ${S}`),r(`mkdir -p ${S}`))},a=S=>{let{currentExportArchivePath:C,currentExportWorkingPath:P}=i(S);Ge(`\u{1F69A} Moving files from ${Z.default.gray(P)} to ${Z.default.gray(C)}`),r(`mv ${P} ${C}`)},c=()=>{for(let S of ui){let{currentExportWorkingPath:C,currentExportArchivePath:P}=i(S);if(!Se.default.existsSync(C)){rl("\u{1F4C1} Source directory has not been created:",C);continue}try{h(S),a(S),y(S)}catch(J){rl(`\u{1F69A} Error moving files to ${P}`,J.message),p(S);continue}}},d=()=>{for(let S of ui){let{currentExportArchivePath:C,currentExportWorkingPath:P}=i(S);Se.default.existsSync(C)&&(Ue(`\uFE0F\u267B\uFE0F  Restoring ${Z.default.gray(C)}`),r(`cp -R ${C} ${P}`))}w()},h=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Se.default.existsSync(C)&&(Ge(`\u{1F4BF} Creating backup of ${Z.default.gray(C)}`),r(`mv ${C} ${P}`))},p=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Se.default.existsSync(P)&&(Ue(`\uFE0F\u267B\uFE0F  Restoring backup ${Z.default.gray(C)}`),r(`mv ${P} ${C}`))},y=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Ue(`\uFE0F\u{1F5D1}\uFE0F Removing backup ${Z.default.gray(C)}`),r(`rm -rf ${P}`)},m=()=>{console.log(`
 ${Z.default.black(Z.default.bgGreen(" Gatsby (start) "))}

package/gatsby-node.ts

@@ -22,6 +22,7 @@ const GRIDDO_STORE_MODE = (process.env.GRIDDO_STORE_MODE ||
 const PUBLIC_FOLDER = path.resolve(__dirname, "./public");
 const STORE_DIR_PATH = path.resolve(__dirname, "./store/");
 const REPORT_FILE = path.resolve(PUBLIC_FOLDER, "__build-report__.json");
+const envVars: Record<string, any> = {};
 
 // -----------------------------------------------------------------------------
 // onPreInit
@@ -30,6 +31,18 @@ export const onPreInit = async () => {
 	splash();
 	initCache();
 	prepareStaticFolder();
+
+	Object.keys(process.env)
+		.filter((key) => key.startsWith("GRIDDO"))
+		.forEach((key) => (envVars[key] = process.env[key]));
+
+	console.log("%%%");
+	console.log("- GRIDDO ENVS VARS -");
+	console.log(envVars);
+	console.log("- ALL ENVS VARS -");
+	console.log(process.env);
+	console.log("%%%");
+
 	StoreService.init(STORE_DIR_PATH, {
 		sanitize: true,
 		mode: GRIDDO_STORE_MODE,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.213",
+	"version": "1.75.215",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -22,7 +22,7 @@
 	"scripts": {
 		"build": "yarn run build:exporter",
 		"build:exporter": "esbuild ./scripts/griddo-exporter.ts --bundle --platform=node --minify --outfile=./build/index.js",
-		"export": "gatsby build --prefix-paths",
+		"export": "gatsby telemetry --disable && gatsby build --prefix-paths",
 		"clean": "gatsby clean; rm -rf .cache public assets dist build store",
 		"prepare": "yarn run build:exporter",
 		"watch:tscheck": "tsc --noEmit --watch"
@@ -33,7 +33,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^1.75.213",
+		"@griddo/core": "^1.75.215",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-styled-components": "^1.10.7",
@@ -63,7 +63,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.213",
+		"@griddo/eslint-config-back": "^1.75.215",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -111,5 +111,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "bf9bb03e37c73b2019796561772a2a2d56e80e65"
+	"gitHead": "991b5419f859e414d995ba5b0ee7c5d20931f8e3"
 }

package/scripts/griddo-exporter.ts

@@ -52,11 +52,14 @@ const runner = (command: string, env: Env = {}) =>
 
 const getAssetPrefix = (domain: string) => {
 	// TODO: Usar asset_prefix del dominio
-	if (!process.env.GRIDDO_ASSET_PREFIX || !domain) return "";
+	if (!(process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX) || !domain)
+		return "";
 
 	if (!domain.startsWith("pro-")) return "";
 
-	return `${process.env.GRIDDO_ASSET_PREFIX}/${domain}`;
+	return `${
+		process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX
+	}/${domain}`;
 };
 
 // -----------------------------------------------------------------------------

package/src/services/store.ts

@@ -57,7 +57,8 @@ dotenv.config();
 // Envs
 const API_URL = process.env.API_URL as string;
 const CXBRANCH = process.env.CXBRANCH;
-const REACT_APP_INSTANCE = process.env.GRIDDO_REACT_APP_INSTANCE;
+const REACT_APP_INSTANCE =
+	process.env.GRIDDO_REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
 const GRIDDO_API_CONCURRENCY_COUNT = process.env.GRIDDO_API_CONCURRENCY_COUNT;
 const PUBLIC_API_URL = process.env.PUBLIC_API_URL as string;
 const RENDER_ID = process.env.RENDERID || new Date().valueOf().toString();

package/src/utils/shared.ts

@@ -11,8 +11,9 @@ dotenv.config();
 
 // Envs
 const GRIDDO_BUILD_LOGS =
-	!!process.env.GRIDDO_BUILD_LOGS &&
-	!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);
+	(!!process.env.GRIDDO_BUILD_LOGS &&
+		!!JSON.parse(process.env.GRIDDO_BUILD_LOGS)) ||
+	(!!process.env.LOGS && !!JSON.parse(process.env.LOGS));
 
 /**
  * Walk a directory and returns the file pathts.

package/src/utils/sites.ts

@@ -15,10 +15,18 @@ import { AllPagesResponse } from "../types/api";
 
 // Envs
 const API_URL = process.env.API_URL;
-const GRIDDO_RENDER_ALL_SITES = !!process.env.GRIDDO_RENDER_ALL_SITES;
+const GRIDDO_RENDER_ALL_SITES =
+	!!process.env.GRIDDO_RENDER_ALL_SITES || !!process.env.updateAllSites;
 const GRIDDO_RENDER_SITE =
-	process.env.GRIDDO_RENDER_SITE && parseInt(process.env.GRIDDO_RENDER_SITE);
-const GRIDDO_RENDER_PAGES = (process.env.GRIDDO_RENDER_PAGES || "")
+	(process.env.GRIDDO_RENDER_SITE &&
+		parseInt(process.env.GRIDDO_RENDER_SITE)) ||
+	(process.env.testSite && parseInt(process.env.testSite));
+
+const GRIDDO_RENDER_PAGES = (
+	process.env.GRIDDO_RENDER_PAGES ||
+	process.env.testPage ||
+	""
+)
 	.split(",")
 	.map((item) => parseInt(item))
 	.filter(Boolean);