@griddo/cx 10.4.19 → 10.4.21

package/gatsby-config.ts

@@ -2,13 +2,13 @@ import type { GatsbyConfig } from "gatsby";
 
 import dotenv from "dotenv";
 
-import { resolveComponentsPath } from "./exporter/utils/instance";
+import { resolveComponentsPath } from "./build";
 
 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/gatsby-node.ts

@@ -1,22 +1,21 @@
+import type { GatsbyPageObject } from "./src/types";
 import type { GatsbyNode } from "gatsby";
 
 import path from "node:path";
 
-import { logInfo, logPageSize } from "./exporter/utils/shared";
-import { getBuildPages } from "./exporter/utils/store";
-import { getConfig } from "./exporter/utils/temp-utils";
+import { getConfig, logInfo, logPageSize } from "./build";
+import { getBuildPagesFromStore } from "./exporter/utils/store";
 import { getMatchPath } from "./src/gatsby-node-utils";
-import { GatsbyPageObject } from "./src/types";
-
-const dirs = getConfig().dirs();
-const store = path.join(dirs.__cx, "store");
-const template = path.join(dirs.__ssg, "src/components/template.tsx");
 
 const GRIDDO_BUILD_LOGS = JSON.parse(process.env.GRIDDO_BUILD_LOGS || "false");
 
-const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
-	const pages = getBuildPages<GatsbyPageObject>(store);
+const { __ssg } = getConfig().paths();
+const template = path.join(__ssg, "src/components/template.tsx");
+const pages = getBuildPagesFromStore<GatsbyPageObject>({
+	withSizeProp: GRIDDO_BUILD_LOGS,
+});
 
+const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
 	for await (const page of pages) {
 		if (!page) return;
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.19",
+	"version": "10.4.21",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -19,7 +19,7 @@
 		"griddo-cx": "./start-render.js"
 	},
 	"scripts": {
-		"build": "yarn build:exporter && yarn build:reset-render && yarn build:build-complete && yarn build:start-render && yarn build:run-start-render && yarn build:browser && yarn build:upload-search-content",
+		"build": "yarn build:exporter && yarn build:reset-render && yarn build:build-complete && yarn build:start-render && yarn build:run-start-render && yarn build:browser && yarn build:upload-search-content && yarn build:types",
 		"build:upload-search-content": "esbuild ./exporter/upload-search-content.ts --bundle --platform=node --minify --outfile=./build/upload-search-content.js",
 		"build:exporter": "esbuild ./exporter/index.ts --bundle --platform=node --minify --outfile=./build/index.js",
 		"build:build-complete": "esbuild ./exporter/build-complete.ts --bundle --platform=node --minify --outfile=./build/build-complete.js",
@@ -27,13 +27,14 @@
 		"build:start-render": "esbuild ./exporter/start-render.ts --bundle --platform=node --minify --outfile=./build/start-render.js",
 		"build:run-start-render": "esbuild ./exporter/run-start-render.ts --bundle --platform=node --minify --outfile=./build/run-start-render.js",
 		"build:browser": "esbuild ./exporter/browser/index.ts --platform=node --bundle --minify --outfile=./build/browser/index.js",
-		"build:types": "npx tsc --emitDeclarationOnly --declaration --outDir build --project tsconfig.json",
+		"build:types": "npx tsc --emitDeclarationOnly --declaration --outDir build --project tsconfig.exporter.json",
 		"export:complete": "node ./build/build-complete.js",
 		"export:reset": "node ./build/reset-render.js",
 		"prepare": "yarn run build",
 		"watch:tscheck": "tsc --noEmit --watch",
 		"complete-render": "node ./build/build-complete.js",
 		"reset-render": "node ./build/reset-render.js",
+		"test": "tsx ./__tests__/tests-health.ts && jest --verbose",
 		"upload-search-content": "node ./build/upload-search-content.js",
 		"clean": "gatsby clean; rm -rf .cache public assets",
 		"gatsby-build": "gatsby telemetry --disable && gatsby build --prefix-paths"
@@ -44,13 +45,15 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^10.4.19",
+		"@griddo/core": "^10.4.21",
 		"@svgr/webpack": "^5.5.0",
+		"@types/cheerio": "^0.22.35",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-styled-components": "^1.10.7",
 		"babel-plugin-transform-runtime": "^6.23.0",
 		"babel-polyfill": "^6.26.0",
 		"chalk": "^2.4.2",
+		"cheerio": "^1.0.0-rc.12",
 		"dotenv": "^8.1.0",
 		"find-up": "^5.0.0",
 		"fs-extra": "^9.0.1",
@@ -70,6 +73,7 @@
 		"@types/eslint": "^7.29.0",
 		"@types/fs-extra": "^9.0.13",
 		"@types/gradient-string": "^1.1.2",
+		"@types/jest": "^29.5.12",
 		"@types/prettier": "2.7.2",
 		"@types/react": "18.0.28",
 		"@types/react-dom": "18.0.11",
@@ -78,7 +82,9 @@
 		"eslint": "^7.5.0",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-react": "7.14.3",
-		"prettier": "2.0.4"
+		"jest": "^29.7.0",
+		"prettier": "2.0.4",
+		"ts-jest": "^29.1.3"
 	},
 	"peerDependencies": {
 		"axios": "*",
@@ -114,5 +120,5 @@
 	"resolutions": {
 		"memoizee": "0.4.15"
 	},
-	"gitHead": "b383bcb76a78076ab65ed5768ffea987adc18a5e"
+	"gitHead": "e9ee5308a0c6829e0e3c0c82d28f5e580d0bb804"
 }

package/src/components/Head.tsx

@@ -4,7 +4,7 @@ import { generateAutomaticDimensions } from "@griddo-instance";
 import parse from "html-react-parser";
 import * as React from "react";
 
-import { filterHeadIntegrations } from "../../exporter/browser";
+import { filterHeadIntegrations } from "../../build/browser";
 import { cleanCommaSeparated, composeAnalytics, formatImage } from "../utils";
 
 /**

package/src/components/template.tsx

@@ -7,7 +7,7 @@ import parse from "html-react-parser";
 import * as React from "react";
 import { Helmet } from "react-helmet";
 
-import { filterPositionIntegrations } from "../../exporter/browser";
+import { filterPositionIntegrations } from "../../build/browser";
 
 // Gatsby Head
 export { Head } from "./Head";

package/src/gatsby-node-utils.ts

@@ -2,12 +2,12 @@ import type { GatsbyNode } from "gatsby";
 
 import fs from "fs-extra";
 
+import { getConfig } from "../build";
 import {
 	IS_COMPONENT_LIBRARY,
 	PROJECT_ALIASES,
 	resolveComponentsPath,
 } from "../exporter/utils/instance";
-import { getConfig } from "../exporter/utils/temp-utils";
 
 /**
  * Copy the instance's `/static` dir into the Gatsby's to include it in the render assets.
@@ -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 : "";
 

package/src/types.ts

@@ -1,7 +1,7 @@
 import type { Core } from "@griddo/core";
 import type { HeadProps } from "gatsby";
 
-import { SocialsResponse } from "../exporter/types/api";
+import { SocialsResponse } from "../build";
 import {
 	AdditionalInfo,
 	GriddoListPage,

package/tsconfig.json

@@ -9,8 +9,18 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"resolveJsonModule": true,
-		"outDir": "./build"
+		"resolveJsonModule": true
 	},
-	"include": ["./src/**/*.ts", "./src/**/*.tsx", "global.d.ts"]
+	"include": [
+		"./exporter/**/*.ts",
+		"./exporter/**/*.tsx",
+		"./src/**/*.ts",
+		"./src/**/*.tsx",
+		"global.d.ts",
+		"__tests__/**/*.ts",
+		"gatsby-browser.tsx",
+		"gatsby-config.ts",
+		"gatsby-node.ts",
+		"gatsby-ssr.tsx"
+	]
 }