@griddo/cx 1.75.193 → 1.75.196

package/gatsby-browser.tsx

@@ -1,17 +1,9 @@
-// Types
 import type { GatsbyBrowser } from "gatsby";
 
-// Core providers
 import { SessionProvider } from "@griddo/core";
-
-// External libraries
-import * as React from "react";
-
-// Instance
-// @ts-expect-error
+// @ts-expect-error components is unknown
 import { browser } from "components";
-
-// Gatsby Browser API
+import * as React from "react";
 
 export const disableCorePrefetching = () => {
 	if (browser.disableCorePrefetching) {

package/gatsby-config.ts

@@ -1,10 +1,7 @@
-// Types
 import type { GatsbyConfig } from "gatsby";
 
-// External libraries
 import dotenv from "dotenv";
 
-// Utils
 import { resolveComponentsPath } from "./src/utils/instance";
 
 dotenv.config();
@@ -13,17 +10,19 @@ dotenv.config();
 const GRIDDO_ASSET_PREFIX = process.env.GRIDDO_ASSET_PREFIX || undefined;
 
 // Gatsby configuration file from client
-const { plugins, ...gatsbyConfig } = require(resolveComponentsPath("builder.config.js"));
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { plugins, ...gatsbyConfig } = require(resolveComponentsPath(
+	"builder.config.js"
+));
 
 const config: GatsbyConfig = {
-	// cliente config
+	// Client config
 	...gatsbyConfig,
 	plugins: [
-		// client plugins
+		// Client plugins
 		...plugins,
 
-		// defaults plugins
-		"gatsby-plugin-provide-react",
+		// Defaults plugins
 		"gatsby-plugin-react-svg",
 		"gatsby-plugin-react-helmet", // TODO: Remove with Gatsby@5.5.0
 		"gatsby-plugin-no-sourcemaps",
@@ -32,7 +31,8 @@ const config: GatsbyConfig = {
 
 if (GRIDDO_ASSET_PREFIX) {
 	config.assetPrefix = GRIDDO_ASSET_PREFIX;
-	config.pathPrefix = undefined;
+	// @ts-expect-error what the fuck
+	config.pathPrefix = null;
 }
 
 export default config;

package/gatsby-node.ts

@@ -1,47 +1,41 @@
-// Types
-import type { GatsbyNode } from "gatsby";
 import type { StoreMode } from "./src/types/global";
+import type { GatsbyNode } from "gatsby";
 
-// External libraries
-import dotenv from "dotenv";
 import path from "path";
 
-// Services
+import dotenv from "dotenv";
+
 import { RobotsService } from "./src/services/robots";
 import { StoreService } from "./src/services/store";
-
-// Utils
 import { initCache } from "./src/utils/cache";
-import {
-	prepareServe,
-	prepareStaticFolder,
-	updateDist,
-} from "./src/utils/folders";
-import { isComponentLibraryEnv, projectAliases } from "./src/utils/instance";
-import { generateSitemaps, setPagesRenderEnd } from "./src/utils/sites";
+import { prepareStaticFolder, updateDist } from "./src/utils/folders";
 import { logInfo, logPageSize, msToSec, splash } from "./src/utils/shared";
+import { generateBuildReport, generateSitemaps } from "./src/utils/sites";
 
 dotenv.config();
 
 // Envs
-const IS_SERVE = !!process.env.IS_SERVE && !!JSON.parse(process.env.IS_SERVE);
 const GRIDDO_STORE_MODE = (process.env.GRIDDO_STORE_MODE ||
 	"file") as StoreMode;
 
 // Consts
-const storeDirPath = path.resolve(__dirname, "./.store/");
-const isMonorepo = !isComponentLibraryEnv;
+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 GRIDDO_SANITIZE_PAGES = true;
 
 // -----------------------------------------------------------------------------
 // onPreInit
 // -----------------------------------------------------------------------------
 export const onPreInit = async () => {
-	if (isMonorepo) splash();
-
+	splash();
 	initCache();
 	prepareStaticFolder();
-	StoreService.init(storeDirPath, { mode: GRIDDO_STORE_MODE });
-	await StoreService.saveBuildData();
+	StoreService.init(STORE_DIR_PATH, {
+		sanitize: GRIDDO_SANITIZE_PAGES,
+		mode: GRIDDO_STORE_MODE,
+	});
+	await StoreService.createBuildSource();
 
 	console.log("\n✨ onPreInit\n");
 };
@@ -49,30 +43,36 @@ export const onPreInit = async () => {
 // -----------------------------------------------------------------------------
 // createPages
 // -----------------------------------------------------------------------------
-export const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
+export const createPages: GatsbyNode["createPages"] = async ({
+	actions: { createPage },
+}) => {
 	const pages = StoreService.getPages();
 
 	let totalPagesSize = 0;
 
+	// We need to use a `for..of` to iterate over `pages` since it could be a
+	// generator and for example a `forEach` doesn't work on it. Besides a
+	// `for..of` is probably the best performance option.
 	for (const page of pages) {
 		const startTime = performance.now();
 
-		actions.createPage(page);
+		createPage(page);
 
+		const {
+			size: pageSize,
+			context: { id },
+			path: pagePath,
+		} = page;
 		const duration = msToSec(performance.now() - startTime);
+		const size = logPageSize(Math.round(pageSize));
 
-		logInfo(
-			`Creating page (${GRIDDO_STORE_MODE}) ${page.path} - ${duration}s - ${
-				page.context.id
-			} - ${logPageSize(Math.round(page.size))}`
-		);
+		logInfo(`Creating page ${pagePath} - ${duration}s - ${id} - ${size}`);
 
-		totalPagesSize += page.size;
+		totalPagesSize += pageSize;
 	}
 
-	console.info(
-		`Total page-data.json size: ${(totalPagesSize / 1024).toFixed(3)}MB`
-	);
+	const totalPagesSizeMsg = (totalPagesSize / 1024).toFixed(3);
+	console.info(`Total page-data.json size: ${totalPagesSizeMsg}MB`);
 
 	console.log("\n✨ createPages\n");
 };
@@ -81,17 +81,12 @@ export const createPages: GatsbyNode["createPages"] = async ({ actions }) => {
 // onPostBuild
 // -----------------------------------------------------------------------------
 export const onPostBuild = async () => {
-	const {
-		buildProcessData,
-		createdPages,
-		sitesToPublish,
-	} = StoreService.getMetadata();
-
-	await setPagesRenderEnd(buildProcessData, createdPages);
-	await RobotsService.writeFiles(`${__dirname}/public`);
+	const { buildProcessData, sitesToPublish } = StoreService.getMetadata();
+
+	await generateBuildReport(REPORT_FILE, buildProcessData);
+	await RobotsService.writeFiles(PUBLIC_FOLDER);
 	await generateSitemaps(sitesToPublish);
 	await updateDist();
-	IS_SERVE && (await prepareServe());
 
 	console.log("\n✨ onPostBuild\n");
 };
@@ -99,38 +94,4 @@ export const onPostBuild = async () => {
 // -----------------------------------------------------------------------------
 // onCreateWebpackConfig
 // -----------------------------------------------------------------------------
-// TODO: Use webpack types
-export const onCreateWebpackConfig: GatsbyNode["onCreateWebpackConfig"] = ({
-	actions,
-	plugins,
-	loaders,
-	getConfig,
-}) => {
-	if (isComponentLibraryEnv) {
-		const config = getConfig();
-		config.module.rules = [
-			// Omit the default rule where test === '\.jsx?$'
-			...config.module.rules.filter(
-				(rule: any) => String(rule.test) !== String(/\.jsx?$/)
-			),
-			// Recreate it with custom exclude filter
-			{
-				...loaders.js(),
-				test: /\.jsx?$/,
-				// Exclude all node_modules from transpilation, except for '@griddo/cx'
-				exclude: (modulePath: string) =>
-					/node_modules/.test(modulePath) && !/@griddo\/cx/.test(modulePath),
-			},
-		];
-		actions.replaceWebpackConfig(config);
-	}
-
-	// Add component-system aliases to Webpack's Resolve:
-	actions.setWebpackConfig({
-		resolve: {
-			fallback: { path: false },
-			alias: projectAliases,
-		},
-		plugins: [plugins.provide({ process: "process/browser" })],
-	});
-};
+export { onCreateWebpackConfig } from "./src/utils/gatsby";

package/gatsby-ssr.tsx

@@ -1,16 +1,9 @@
-import React from "react";
-
-// Types
 import type { GatsbySSR } from "gatsby";
 
-// Core providers
 import { SessionProvider } from "@griddo/core";
-
-// Instance
-// @ts-ignore
+// @ts-expect-error components is unknown
 import { ssr } from "components";
-
-// Gatsby SSR API
+import * as React from "react";
 
 export const wrapPageElement: GatsbySSR["wrapPageElement"] = ({ props }) => {
 	if (ssr.wrapPageElement) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.193",
+	"version": "1.75.196",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -20,14 +20,10 @@
 		"griddo-cx": "./index.js"
 	},
 	"scripts": {
-		"start": "gatsby develop -H 0.0.0.0",
 		"build": "yarn run build:exporter",
 		"build:exporter": "esbuild ./scripts/griddo-exporter.ts --bundle --platform=node --minify --outfile=./build/index.js",
-		"build:serve": "IS_SERVE=true gatsby build --prefix-paths && gatsby serve",
 		"export": "gatsby build --prefix-paths",
 		"clean": "gatsby clean; rm -rf .cache public assets dist build .store",
-		"serve": "gatsby serve",
-		"format": "prettier --write .",
 		"prepare": "yarn run build:exporter",
 		"watch:tscheck": "tsc --noEmit --watch"
 	},
@@ -37,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.193",
+		"@griddo/core": "^1.75.196",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-styled-components": "^1.10.7",
@@ -52,7 +48,6 @@
 		"gatsby": "^4.8.0",
 		"gatsby-plugin-no-sourcemaps": "^4.8.0",
 		"gatsby-plugin-polyfill-io": "^1.1.0",
-		"gatsby-plugin-provide-react": "^1.0.2",
 		"gatsby-plugin-react-helmet": "^5.8.0",
 		"gatsby-plugin-react-svg": "^3.1.0",
 		"gatsby-plugin-sass": "^5.21.0",
@@ -69,7 +64,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.193",
+		"@griddo/eslint-config-back": "^1.75.196",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -117,5 +112,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "724e3fe43760cf3c8efb56dc4207a3e32e01f9dc"
+	"gitHead": "11678ff380b3c5bdb420d5117765637af11c9226"
 }