@griddo/cx 1.75.209 → 1.75.210

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 fp=Y(mt()),Uu=Y(Gt()),hp=Y(eu()),Gu=Y($u());var Hu="1.75.209";Uu.default.config();var dp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);function zu(...e){dp&&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 fp=Y(mt()),Uu=Y(Gt()),hp=Y(eu()),Gu=Y($u());var Hu="1.75.210";Uu.default.config();var dp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);function zu(...e){dp&&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 @@ ${m}
 ${y}
 
 =============
-`)),s&&(typeof o?.attempt!="number"||o.attempt>=parseInt(Qu))&&process.exit(1)}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await el({endpoint:t})}};async function tl(){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)]}sl.default.config();var ui=["dist","assets","apiCache"],rl=["public",".store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),ol=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,il.execSync)(e,{cwd:ol,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}`,nl=(...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(`
+`)),s&&(typeof o?.attempt!="number"||o.attempt>=parseInt(Qu))&&process.exit(1)}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await el({endpoint:t})}};async function tl(){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)]}sl.default.config();var ui=["dist","assets","apiCache"],rl=["public","store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),ol=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,il.execSync)(e,{cwd:ol,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}`,nl=(...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 tl();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(ol,S);return{domainExportArchiveBasePath:C,currentExportArchivePath:P,currentExportBackupPath:J,currentExportWorkingPath:de}},s=()=>{for(let S of[...ui,...rl]){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)){nl("\u{1F4C1} Source directory has not been created:",C);continue}try{h(S),a(S),m(S)}catch(J){nl(`\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}`))}_()},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}`))},m=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Ue(`\uFE0F\u{1F5D1}\uFE0F Removing backup ${Z.default.gray(C)}`),r(`rm -rf ${P}`)},y=()=>{console.log(`
 ${Z.default.black(Z.default.bgGreen(" Gatsby (start) "))}

package/gatsby-node.ts

@@ -15,11 +15,12 @@ import { generateBuildReport, generateSitemaps } from "./src/utils/sites";
 dotenv.config();
 
 // Envs
-const GRIDDO_STORE_MODE = "memory"; // (process.env.GRIDDO_STORE_MODE || "file") as StoreMode;
+const GRIDDO_STORE_MODE = (process.env.GRIDDO_STORE_MODE ||
+	"file") as StoreMode;
 
 // Consts
 const PUBLIC_FOLDER = path.resolve(__dirname, "./public");
-const STORE_DIR_PATH = path.resolve(__dirname, "./.store/");
+const STORE_DIR_PATH = path.resolve(__dirname, "./store/");
 const REPORT_FILE = path.resolve(PUBLIC_FOLDER, "__build-report__.json");
 const GRIDDO_SANITIZE_PAGES = false;
 const envVars: Record<string, any> = {};
@@ -70,11 +71,11 @@ export const createPages: GatsbyNode["createPages"] = async ({
 			path: pagePath,
 		} = page;
 		const duration = msToSec(performance.now() - startTime);
-		const size = logPageSize(Math.round(pageSize));
+		const size = pageSize ? logPageSize(Math.round(pageSize)) : 0;
 
 		logInfo(`Creating page ${pagePath} - ${duration}s - ${id} - ${size}`);
 
-		totalPagesSize += pageSize;
+		totalPagesSize += pageSize || 0;
 	}
 
 	const totalPagesSizeMsg = (totalPagesSize / 1024).toFixed(3);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.209",
+	"version": "1.75.210",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -23,7 +23,7 @@
 		"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",
-		"clean": "gatsby clean; rm -rf .cache public assets dist build .store",
+		"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.209",
+		"@griddo/core": "^1.75.210",
 		"@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.209",
+		"@griddo/eslint-config-back": "^1.75.210",
 		"@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": "dd50cdda90640e925165bbaebb9e729af53daacb"
+	"gitHead": "2b9df0e7e16083025b24814e8952c45078a732a8"
 }

package/scripts/griddo-exporter.ts

@@ -19,7 +19,7 @@ dotenv.config();
 
 // Envs
 const artifactsArchivable = ["dist", "assets", "apiCache"];
-const artifactsDisposable = ["public", ".store", ".cache"];
+const artifactsDisposable = ["public", "store", ".cache"];
 
 // Where we are going to find export folders
 const execBasePath = pkgDir.sync()!;

package/src/services/store.ts

@@ -132,8 +132,8 @@ class StoreService {
 				fs.mkdirSync(basePath);
 			}
 
-			if (!fs.existsSync(path.resolve(basePath, "pages"))) {
-				fs.mkdirSync(path.resolve(basePath, "pages"));
+			if (!fs.existsSync(path.resolve(basePath))) {
+				fs.mkdirSync(path.resolve(basePath));
 			}
 		}
 	}
@@ -464,7 +464,7 @@ class StoreService {
 	 * Return an iterator with pages read from the file system.
 	 */
 	private static *getPagesFromFiles() {
-		const pagesDirPath = path.resolve(this.basePath, "pages");
+		const pagesDirPath = path.resolve(this.basePath);
 		const jsonFilePaths = walk(pagesDirPath).filter(
 			(file) => path.extname(file) === ".json"
 		);
@@ -474,7 +474,7 @@ class StoreService {
 				const jsonContent = fs.readFileSync(filePath, "utf-8");
 				const page = JSON.parse(jsonContent) as GatsbyPageObject;
 				page.size = fs.statSync(filePath).size / 1024;
-				yield { ...page };
+				yield page;
 			} catch {
 				console.error(`Error: The file ${filePath} doesn't exist`);
 			}
@@ -497,7 +497,7 @@ class StoreService {
 		const promises = pages.map(async (pageObject) => {
 			const filename = `${createSha256(pageObject.path)}.json`;
 			const fileContent = JSON.stringify(pageObject);
-			const filePath = path.resolve(this.basePath, "pages", filename);
+			const filePath = path.resolve(this.basePath, filename);
 			await fsp.writeFile(filePath, fileContent);
 		});
 

package/src/types/pages.ts

@@ -100,7 +100,7 @@ export type GatsbyPageObject = {
 	path: string;
 	component: string;
 	/** Page size in bytes */
-	size: number;
+	size?: number;
 	context: {
 		// Page
 		BUILD_MODE?: string;

package/src/utils/pages.ts

@@ -167,7 +167,7 @@ async function createGatsbyPageObject(
 		matchPath: "",
 		path: filepath,
 		component: COMPONENT,
-		size: 0,
+		size: undefined,
 		context: {
 			// Page
 			id,