@griddo/cx 10.4.7 → 10.4.9

package/exporter/utils/temp-utils.ts

@@ -0,0 +1,86 @@
+import path from "node:path";
+
+import fsx from "fs-extra";
+
+function getConfigSync() {
+	try {
+		// eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-missing-require, node/no-unpublished-require
+		const configModule = require("../../cx.config");
+		const config = configModule.default;
+
+		return config;
+	} catch (error) {
+		process.exit(1);
+	}
+}
+
+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);
+	}
+}
+
+/**
+ * Update the Griddo's `/dist` dir with the contents from `public` dir only
+ * with files of type: js, json and css.
+ */
+async function legacy__createDistFromGatsbyPublic(
+	domain: string,
+	needsAssetPrefix: boolean
+) {
+	const config = await getConfig();
+	const dirs = config.dirs(domain);
+
+	const cxDistDir = path.resolve(dirs.__cx, "dist");
+	const cxAssetsDir = path.resolve(dirs.__cx, "assets");
+	const cxDistDirWithDomain = path.join(dirs.__cx, "dist", domain);
+	const publicDir = path.resolve(dirs.__ssg, "public");
+
+	const validFiles = fsx
+		.readdirSync(publicDir)
+		.filter(
+			(file) =>
+				path.extname(file) === ".js" ||
+				path.extname(file) === ".json" ||
+				path.extname(file) === ".css"
+		);
+
+	const pageDataSrc = `${publicDir}/page-data`;
+	const pageDataDest = `${cxAssetsDir}/page-data`;
+
+	const projectStaticSrc = path.resolve(dirs.__cx, "./static");
+	const projectStaticDest = cxAssetsDir;
+
+	const gatsbyStaticSrc = `${cxDistDir}/static`;
+	const gatsbyStaticDest = `${cxAssetsDir}/static`;
+
+	try {
+		fsx.mkdirSync(cxAssetsDir, { recursive: true });
+		fsx.copySync(publicDir, cxDistDir);
+
+		if (needsAssetPrefix) {
+			fsx.copySync(pageDataSrc, pageDataDest);
+			fsx.copySync(projectStaticSrc, projectStaticDest, { overwrite: false });
+			fsx.copySync(gatsbyStaticSrc, gatsbyStaticDest, { overwrite: false });
+			fsx.copySync(projectStaticSrc, cxDistDirWithDomain, {
+				overwrite: false,
+			});
+
+			validFiles.map(async (file) => {
+				const fileSrc = `${publicDir}/${file}`;
+				const fileDest = `${cxAssetsDir}/${file}`;
+				fsx.copySync(fileSrc, fileDest);
+			});
+		}
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+export { legacy__createDistFromGatsbyPublic, getConfig, getConfigSync };

package/gatsby-browser.tsx

@@ -1,8 +1,7 @@
 import type { GatsbyBrowser } from "gatsby";
 
+import { browser } from "@components";
 import { SessionProvider } from "@griddo/core";
-// @ts-expect-error components is unknown
-import { browser } from "components";
 import * as React from "react";
 
 export const disableCorePrefetching = () => {

package/gatsby-config.ts

@@ -6,7 +6,8 @@ import { resolveComponentsPath } from "./exporter/utils/instance";
 
 dotenv.config();
 
-// Envs
+// Este process.env.GRIDDO_ASSET_PREFIX se lee porque se ha introducido en
+// `getEnvRunner()`.
 const GRIDDO_ASSET_PREFIX = process.env.GRIDDO_ASSET_PREFIX || undefined;
 
 // Gatsby configuration file from client

package/gatsby-node.ts

@@ -2,67 +2,38 @@ import type { GatsbyNode } from "gatsby";
 
 import path from "node:path";
 
-import { RobotsService } from "./exporter/services/robots";
 import { logInfo, logPageSize } from "./exporter/utils/shared";
-import { generateBuildReport, generateSitemaps } from "./exporter/utils/sites";
-import { getBuildMetadata, getBuildPages } from "./exporter/utils/store";
-import {
-	getMatchPath,
-	prepareStaticDir,
-	updateDist,
-} from "./src/gatsby-node-utils";
+import { getBuildPages } from "./exporter/utils/store";
+import { getConfigSync } from "./exporter/utils/temp-utils";
+import { getMatchPath } from "./src/gatsby-node-utils";
 import { GatsbyPageObject } from "./src/types";
 
-const publicDirPath = path.resolve(__dirname, "./public");
-const storeDirPath = path.resolve(__dirname, "./store/");
-const reportFilePath = path.resolve(publicDirPath, "__build-report__.json");
-const gatsbyTemplateFile = path.resolve(
-	__dirname,
-	"./src/components/template.tsx"
-);
+const dirs = getConfigSync().dirs();
+const storeDir = path.join(dirs.__cx, "store");
+const templateFile = path.join(dirs.__ssg, "src/components/template.tsx");
 
-// onPreInit
-const onPreInit = async () => {
-	prepareStaticDir();
-};
-
-// createPages
-const createPages: GatsbyNode["createPages"] = async ({
-	actions: { createPage },
-}) => {
-	const pages = getBuildPages<GatsbyPageObject>(storeDirPath);
+const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
+	const pages = getBuildPages<GatsbyPageObject>(storeDir);
 
 	for await (const page of pages) {
-		// SECURITY
-		if (!page) {
-			return;
-		}
+		if (!page) return;
+
 		const { domain, compose } = page.context.fullPath;
 		const matchPath = getMatchPath(domain, compose);
 
-		page.component = gatsbyTemplateFile;
+		page.component = templateFile;
 		page.matchPath = matchPath;
 
-		createPage(page);
+		actions.createPage(page);
 
-		logInfo(
-			`Creating page ${page.path} - ${page.context.id} - ${logPageSize(
-				Math.round(page.size || 0)
-			)}`
-		);
-	}
-};
-
-// onPostBuild
-const onPostBuild = async () => {
-	const { buildProcessData, sitesToPublish } = getBuildMetadata(storeDirPath);
+		const path = page.path;
+		const id = page.context.id;
+		const size = logPageSize(Math.round(page.size || 0));
 
-	await generateBuildReport(reportFilePath, buildProcessData);
-	await RobotsService.writeFiles(publicDirPath);
-	await generateSitemaps(sitesToPublish);
-	await updateDist();
+		logInfo(`Creating page ${path} - ${id} - ${size}`);
+	}
 };
 
 // onCreateWebpackConfig
 export { onCreateWebpackConfig } from "./src/gatsby-node-utils";
-export { createPages, onPostBuild, onPreInit };
+export { createPages };

package/gatsby-ssr.tsx

@@ -1,8 +1,7 @@
 import type { GatsbySSR } from "gatsby";
 
+import { ssr } from "@components";
 import { SessionProvider } from "@griddo/core";
-// @ts-expect-error components is unknown
-import { ssr } from "components";
 import * as React from "react";
 
 export const wrapPageElement: GatsbySSR["wrapPageElement"] = ({ props }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.7",
+	"version": "10.4.9",
 	"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": "798ce16f44f99f35c4eb372b04e54f8a1f433469"
 }

package/src/components/Head.tsx

@@ -1,7 +1,6 @@
 import type { CustomHeadProps } from "../types";
 
-// @ts-expect-error components is unknown
-import { generateAutomaticDimensions } from "components";
+import { generateAutomaticDimensions } from "@components";
 import parse from "html-react-parser";
 import * as React from "react";
 

package/src/components/template.tsx

@@ -1,8 +1,7 @@
 import type { TemplateProps } from "../types";
 
+import { components, SiteProvider, templates } from "@components";
 import { Core, Page as RenderGriddoPage } from "@griddo/core";
-// @ts-expect-error components is unknown
-import { components, SiteProvider, templates } from "components";
 import { Link, navigate } from "gatsby";
 import parse from "html-react-parser";
 import * as React from "react";

package/src/gatsby-node-utils.ts

@@ -1,7 +1,5 @@
 import type { GatsbyNode } from "gatsby";
 
-import path from "node:path";
-
 import fs from "fs-extra";
 
 import {
@@ -32,59 +30,6 @@ function prepareStaticDir() {
 	}
 }
 
-/**
- * Update the Griddo's `/dist` dir with the contents from `/public` only with files of type:
- * - js
- * - json
- * - css
- */
-async function updateDist() {
-	const src = "./public";
-	const dest = "./dist";
-
-	const domainDestPath = `${dest}/${process.env.DOMAIN}`;
-
-	const files = fs
-		.readdirSync(src)
-		.filter(
-			(file) =>
-				path.extname(file) === ".js" ||
-				path.extname(file) === ".json" ||
-				path.extname(file) === ".css"
-		);
-
-	const assetsDest = "./assets";
-
-	const pageDataSrc = `${src}/page-data`;
-	const pageDataDest = `${assetsDest}/page-data`;
-
-	const projectStaticSrc = "./static";
-	const projectStaticDest = assetsDest;
-
-	const gatsbyStaticSrc = `${dest}/static`;
-	const gatsbyStaticDest = `${assetsDest}/static`;
-
-	try {
-		fs.mkdirSync(assetsDest, { recursive: true });
-		fs.copySync(src, dest);
-
-		if (process.env.NEEDS_ASSET_DOMAIN_PREFIX) {
-			fs.copySync(pageDataSrc, pageDataDest);
-			fs.copySync(projectStaticSrc, projectStaticDest, { overwrite: false });
-			fs.copySync(gatsbyStaticSrc, gatsbyStaticDest, { overwrite: false });
-			fs.copySync(projectStaticSrc, domainDestPath, { overwrite: false });
-
-			files.map(async (file) => {
-				const fileSrc = `${src}/${file}`;
-				const fileDest = `${assetsDest}/${file}`;
-				fs.copySync(fileSrc, fileDest);
-			});
-		}
-	} catch (err) {
-		console.error(err);
-	}
-}
-
 const onCreateWebpackConfig: GatsbyNode["onCreateWebpackConfig"] = ({
 	actions,
 	plugins,
@@ -146,9 +91,8 @@ function getMatchPath(domain: string, compose: string) {
 }
 
 export {
+	getGatsbyAssetPrefixSlug,
 	getMatchPath,
 	onCreateWebpackConfig,
 	prepareStaticDir,
-	updateDist,
-	getGatsbyAssetPrefixSlug,
 };

package/exporter/adapters/astro/index.ts

@@ -1,36 +0,0 @@
-import { getAstroDomainRunner } from "./utils";
-import { getInstanceDomains } from "../../utils/domains";
-import { createBuildData } from "../../utils/download-build-data";
-import { printExporterLogo } from "../../utils/shared";
-
-/**
- * Astro adapter for Griddo.
- */
-async function runAstroAdapter() {
-	printExporterLogo("astro");
-
-	const domains = await getInstanceDomains();
-
-	for (const domain of domains) {
-		const runner = getAstroDomainRunner(domain);
-		// ---------------------------------------------------------------------- //
-		// Init the render, restore Gatsby /.cache and /public dirs               //
-		// ---------------------------------------------------------------------- //
-		runner.init();
-		// runner.whatEverAction();
-		// runner.otherAstroRelatedFunction();
-
-		// ---------------------------------------------------------------------- //
-		// Download domain build data (sites, pages, etc) and generator a dirs    //
-		// called `store` where all the domain render data is saved.              //
-		// ---------------------------------------------------------------------- //
-		await createBuildData(domain);
-
-		// ---------------------------------------------------------------------- //
-		// Call the `astro build` command.                                        //
-		// ---------------------------------------------------------------------- //
-		runner.runAstroBuild();
-	}
-}
-
-export { runAstroAdapter };

package/exporter/adapters/astro/utils.ts

@@ -1,30 +0,0 @@
-import dotenv from "dotenv";
-
-import { getEnvRunner } from "../../utils/runners";
-
-dotenv.config();
-
-/**
- * Return a runner, a serie of functions to manage the Astro render artifacts.
- */
-function getAstroDomainRunner(domain: string) {
-	const run = getEnvRunner({
-		DOMAIN: domain,
-		GRIDDO_RENDERID: new Date().valueOf(),
-	});
-
-	const init = () => {
-		console.info(`Initializing exporter for the domain ${domain}`);
-	};
-
-	const runAstroBuild = () => {
-		run("yarn astro-build");
-	};
-
-	return {
-		init,
-		runAstroBuild,
-	};
-}
-
-export { getAstroDomainRunner };

package/exporter/index-width-adapter.ts

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable node/shebang */
-import { Adapters, runGatsbyAdapter } from "./adapters";
-
-const adapter = process.env.GRIDDO_CX_ADAPTER as Adapters;
-
-async function main(adapter: Adapters) {
-	if (adapter === "gatsby") {
-		await runGatsbyAdapter();
-		process.exit(0);
-	}
-
-	// if (adapter === "astro") {
-	// 	await runAstroAdapter();
-	// 	process.exit(0);
-	// }
-
-	throw new Error("Adapter not configured correctly");
-}
-
-// Go render, go!
-main(adapter).catch((err) => {
-	console.error("Error in main():", err?.stdout?.toString() || err);
-	process.exit(1);
-});

package/static/README.md

@@ -1,3 +0,0 @@
-# Griddo static folder
-
-The assets in this folder will be handled "as is" and they will not get any kind of optimization at all.