@griddo/cx 10.4.10 → 10.4.12

package/exporter/adapters/gatsby/index.ts

@@ -21,7 +21,7 @@ async function runGatsbyAdapter() {
 	printExporterLogo("gatsby");
 
 	const domains = await getInstanceDomains();
-	const config = await getConfig();
+	const config = getConfig();
 
 	for (const domain of domains) {
 		const runner = getGatsbyDomainRunner(domain);

package/exporter/cx.config.d.ts

@@ -0,0 +1,24 @@
+import { CXConfig } from "./src/types/global";
+
+declare const artifacts: readonly ["public", ".cache", "static"];
+declare const config: CXConfig;
+
+export default config;
+
+declare const CXDir: {
+	EXPORTS: "__exports";
+	CACHE: "__caches";
+	CX: "__cx";
+	SSG: "__ssg";
+	COMPONENTS: "__components";
+	ROOT: "__root";
+};
+
+export type Artifact =
+	| typeof artifacts[number]
+	| "store"
+	| "apiCache"
+	| "dist"
+	| "assets";
+
+export { CXDir, artifacts };

package/exporter/cx.config.js

@@ -0,0 +1,40 @@
+import path from "node:path";
+
+import pkgDir from "pkg-dir";
+
+import { resolveComponentsPath } from "./utils/instance";
+
+// Paths
+const REPO_ROOT_DIR = pkgDir.sync(path.resolve(__dirname, "../.."));
+const CX_ROOT_DIR = pkgDir.sync(__dirname);
+const SSG_DIR = pkgDir.sync(__dirname);
+const CX_CACHE_DIR = path.resolve(CX_ROOT_DIR, "caches");
+const COMPONENTS_DIR = resolveComponentsPath();
+const EXPORTS_DIR = path.join(REPO_ROOT_DIR, "exports/sites");
+
+const artifacts = ["public", ".cache", "static"];
+
+const config = {
+	proDomain: "pro-",
+	CXDir: {
+		EXPORTS: "__exports",
+		CACHE: "__cache",
+		CX: "__cx",
+		SSG: "__ssg",
+		COMPONENTS: "__components",
+		ROOT: "__root",
+	},
+	dirs: (domain) => ({
+		__cache: path.join(CX_CACHE_DIR, domain || ""),
+		__components: COMPONENTS_DIR,
+		__cx: CX_ROOT_DIR,
+		__exports: path.join(EXPORTS_DIR, domain || ""),
+		__root: REPO_ROOT_DIR,
+		__ssg: SSG_DIR,
+	}),
+};
+
+export default config;
+const CXDir = config.CXDir;
+
+export { CXDir, artifacts };

package/exporter/services/robots.ts

@@ -50,7 +50,7 @@ class RobotsService {
 	 * Write robots.txt files for the current rendering domain.
 	 */
 	async writeFiles(domain: string) {
-		const config = await getConfig();
+		const config = getConfig();
 		const dirs = config.dirs(domain);
 		const distDirectory = path.join(dirs.__cx, "dist");
 

package/exporter/utils/folders.ts

@@ -1,4 +1,3 @@
-import type { CXDir } from "../types/global";
 import type { Site } from "../types/sites";
 
 import { spawnSync } from "node:child_process";
@@ -298,7 +297,7 @@ function isMultiPageId(id: number) {
 }
 
 async function removeMultiPagesFromStore() {
-	const config = await getConfig();
+	const config = getConfig();
 	const dirs = config.dirs();
 	const storePath = path.join(dirs.__cx, "store");
 	try {

package/exporter/utils/instance.ts

@@ -62,9 +62,8 @@ function getComponentsLibAliases() {
 			};
 		},
 		{
-			// Por este motivo se puede hacer `... import from "@components" en
+			// Por este motivo se puede hacer `... import from "components" en
 			// los packages del monorepo.
-			"@components": `${resolveComponentsPath()}/src/index.js`,
 			components: `${resolveComponentsPath()}/src/index.js`,
 		}
 	);

package/exporter/utils/pages.ts

@@ -238,8 +238,19 @@ async function createGriddoListPages(
 		const pageNumber = idx + 1;
 		const { domainUrl, compose } = page.fullPath;
 
+		// Crea un id como número negativo y añadiendo un sufijo para los
+		// listados estáticos. Esto es así para marcarlas y posteriormente
+		// borrarlas siempre en cada nuevo render desde el Adapter.
+		//
+		// id de página con mode:"list": 1546
+		// ids de las "sub-páginas": -15460, -15461, -1546n, (-)id(idx)
+		//
+		// @todo eliminar el concepto multipage de CX, debería ser algo core de
+		// Griddo itself: API/AX, que fuesen páginas con sus ids, etc..
+
 		const paginatedPage = {
 			...page,
+			id: parseInt("-" + page.id + idx),
 			fullPath: {
 				...page.fullPath,
 				// Add a page number (tailPageNumber) from page 2 onwards

package/exporter/utils/sites.ts

@@ -151,7 +151,7 @@ async function getSiteData(siteID: number) {
  * Save a file with the end of build process
  */
 async function generateBuildReport() {
-	const config = await getConfig();
+	const config = getConfig();
 	const dirs = config.dirs();
 
 	const DIST_FOLDER = path.join(dirs.__cx, "dist");
@@ -184,7 +184,7 @@ async function generateBuildReport() {
  */
 async function generateSitemaps() {
 	const { sitesToPublish } = await getBuildMetadata();
-	const config = await getConfig();
+	const config = getConfig();
 	const dirs = config.dirs();
 	const basePath = path.resolve(dirs.__cx, "dist");
 

package/exporter/utils/store.ts

@@ -46,7 +46,7 @@ async function* getBuildPages<PageType extends GriddoPageObject>(
  * TODO: Refactorizar para leer un solo archivo: __metadata__.json
  */
 async function getBuildMetadata(): Promise<BuildMetaData> {
-	const config = await getConfig();
+	const config = getConfig();
 	const dirs = config.dirs();
 	const storePath = path.join(dirs.__cx, "store");
 

package/exporter/utils/temp-utils.ts

@@ -2,22 +2,10 @@ import path from "node:path";
 
 import fsx from "fs-extra";
 
-function getConfigSync() {
+function getConfig() {
 	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 configModule = require("../cx.config.js");
 		const config = configModule.default;
 
 		return config;
@@ -34,7 +22,7 @@ async function legacy__createDistFromGatsbyPublic(
 	domain: string,
 	needsAssetPrefix: boolean
 ) {
-	const config = await getConfig();
+	const config = getConfig();
 	const dirs = config.dirs(domain);
 
 	const cxDistDir = path.resolve(dirs.__cx, "dist");
@@ -83,4 +71,4 @@ async function legacy__createDistFromGatsbyPublic(
 	}
 }
 
-export { legacy__createDistFromGatsbyPublic, getConfig, getConfigSync };
+export { legacy__createDistFromGatsbyPublic, getConfig };

package/gatsby-browser.tsx

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

package/gatsby-node.ts

@@ -4,11 +4,11 @@ import path from "node:path";
 
 import { logInfo, logPageSize } from "./exporter/utils/shared";
 import { getBuildPages } from "./exporter/utils/store";
-import { getConfigSync } from "./exporter/utils/temp-utils";
+import { getConfig } from "./exporter/utils/temp-utils";
 import { getMatchPath } from "./src/gatsby-node-utils";
 import { GatsbyPageObject } from "./src/types";
 
-const dirs = getConfigSync().dirs();
+const dirs = getConfig().dirs();
 const storeDir = path.join(dirs.__cx, "store");
 const templateFile = path.join(dirs.__ssg, "src/components/template.tsx");
 

package/gatsby-ssr.tsx

@@ -1,7 +1,7 @@
 import type { GatsbySSR } from "gatsby";
 
-import { ssr } from "@components";
 import { SessionProvider } from "@griddo/core";
+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.10",
+	"version": "10.4.12",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -107,5 +107,8 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5ebecf976ceff5858e8395eea3ec113a488a1876"
+	"resolutions": {
+		"memoizee": "0.4.15"
+	},
+	"gitHead": "0e1a43fd246d2a955b9d4040c1489ff733f4ed5e"
 }

package/src/components/Head.tsx

@@ -1,6 +1,6 @@
 import type { CustomHeadProps } from "../types";
 
-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,7 +1,7 @@
 import type { TemplateProps } from "../types";
 
-import { components, SiteProvider, templates } from "@components";
 import { Core, Page as RenderGriddoPage } from "@griddo/core";
+import { components, SiteProvider, templates } from "components";
 import { Link, navigate } from "gatsby";
 import parse from "html-react-parser";
 import * as React from "react";