gatsby-core-theme 44.0.1 → 44.0.2

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [44.0.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.1...v44.0.2) (2025-03-14)
+
+
+### Bug Fixes
+
+* author bug ([ee6c416](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ee6c416689bd928c9cfe0f30118d0052419b2d57))
+* new preview endpoint ([ef219ae](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ef219ae542957f27a43eab05fff7f60639f6ab4d))
+* redirects with trailing slash ([2c261cd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2c261cd83b4829d7f4301559141173c72dbebf35))
+
+
+* Merge branch 'tm-5328-pages-preview' into 'master' ([13043a2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/13043a2f3628cdd282a0769774c1efa7239fde9f))
+* Merge branch 'master' into tm-5328-pages-preview ([eb24459](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/eb244594bfb7a16147a5d68883ea13005a7cf493))
+
 ## [44.0.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.0...v44.0.1) (2025-03-13)
 
 

package/gatsby-node.mjs

@@ -84,7 +84,7 @@ function createArchivePage(
   }
   if (!archivePages) {
     console.log(`Archive for ${pageObject.path} broken`);
-  } 
+  }
 
   if (archiveModule.pagination_type !== "load_more") {
     const numOfColumns = archiveModule.desktop_num_of_columns;
@@ -116,8 +116,10 @@ function createArchivePage(
           pageObject.path.charAt(0) !== "/"
             ? `/${pageObject.path}`
             : pageObject.path;
-            
-        archive.items = activeItems.map((item) => processor.clonePage(item, false));
+
+        archive.items = activeItems.map((item) =>
+          processor.clonePage(item, false)
+        );
         switch (archive.currentPage) {
           case 1:
             page.path = pageObject.path;
@@ -133,25 +135,31 @@ function createArchivePage(
               translationsData[pageObject.language],
               "archive_title_prefix",
               ""
-            ).replace("[number]", archive.currentPage)} ${
-              page.meta_title
-            } ${process.env.ARCHIVE_SHOW_SUFFIX === 'true' ? translate(
-              translationsData[pageObject.language],
-              "archive_title_prefix",
-              " - Page [number]"
-            ).replace("[number]", archive.currentPage) : ''}`;
-            
+            ).replace("[number]", archive.currentPage)} ${page.meta_title} ${
+              process.env.ARCHIVE_SHOW_SUFFIX === "true"
+                ? translate(
+                    translationsData[pageObject.language],
+                    "archive_title_prefix",
+                    " - Page [number]"
+                  ).replace("[number]", archive.currentPage)
+                : ""
+            }`;
+
             page.meta_description = `${translate(
               translationsData[pageObject.language],
               "archive_description_prefix",
               ""
             ).replace("[number]", archive.currentPage)} ${
               page.meta_description
-            }  ${process.env.ARCHIVE_SHOW_SUFFIX === 'true' ? translate(
-              translationsData[pageObject.language],
-              "archive_description_suffix",
-              " - Page [number]"
-            ).replace("[number]", archive.currentPage) : ''}`;
+            }  ${
+              process.env.ARCHIVE_SHOW_SUFFIX === "true"
+                ? translate(
+                    translationsData[pageObject.language],
+                    "archive_description_suffix",
+                    " - Page [number]"
+                  ).replace("[number]", archive.currentPage)
+                : ""
+            }`;
             break;
         }
         page.sections.main.modules[archiveModuleIndex] = archive;
@@ -186,7 +194,7 @@ function createArchivePage(
   } else {
     const page = cloneDeep(pageObject);
     const numOfItemsPerPage = Math.sign(archiveModule.num_of_items);
-    
+
     const archive = cloneDeep(page.sections.main.modules[archiveModuleIndex]);
     archive.items = cloneDeep(archivePages)
       .filter((item) =>
@@ -252,11 +260,12 @@ export const createPages = async (
       if ([301, 302].includes(parseInt(value.type))) {
         const redirectName =
           parseInt(value.type) === 301 ? "permanent" : "redirect";
+
+        const to = normalizedTo !== "/" ? (process.env.TRAILING_SLASH === 'true' ? `${normalizedTo}/` : normalizedTo) : normalizedTo;
+        console.log(to);
+        
         stream.write(
-          `rewrite (?i)^${normalizedFrom}/?$ ${normalizedTo.replace(
-            /[{}]/g,
-            ""
-          )} ${redirectName}; \n`
+          `rewrite (?i)^${normalizedFrom}/?$ ${to} ${redirectName}; \n`
         );
       }
 
@@ -383,7 +392,10 @@ export const createPages = async (
               templates: templatesData,
             },
           });
-        } else if (page.path === `${pathPrefix || ""}s` || page.template === 'search') {
+        } else if (
+          page.path === `${pathPrefix || ""}s` ||
+          page.template === "search"
+        ) {
           createPage({
             path: `/${page.path}`,
             component: `${__dirname}/src/components/app-ssr.js`,
@@ -644,8 +656,10 @@ export const onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
     if (miniCssExtractPlugin) {
       miniCssExtractPlugin.options.ignoreOrder = true;
     }
-    // Update the config.
-    actions.replaceWebpackConfig(config);
+    
+    actions.replaceWebpackConfig({
+      ...config,
+    });
   }
 
   actions.setWebpackConfig({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "44.0.1",
+  "version": "44.0.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/helpers/api.mjs

@@ -68,7 +68,12 @@ export async function getSiteSettings(siteName) {
   return callAPIV2(`v0.1/sites/settings/sorted-v2/${siteName}`);
 }
 
-export async function getPages(siteName) {
+export async function getPages(siteName, previewPath=null) {
+  if(previewPath) {
+    console.log(`v0.1/sites/pages/sorted-v2-preview/${siteName}?path=${previewPath}&non_preview_page_attributes=id,path,market_id,relation_id,relation_type,meta_title,title,type,template_id,market`);
+    
+    return callAPIV2(`v0.1/sites/pages/sorted-v2-preview/${siteName}?path=${previewPath}&non_preview_page_attributes=id,path,market_id,relation_id,relation_type,meta_title,title,type,template_id,market`);
+  }
   return callAPIV2(`v0.1/sites/pages/sorted-v2/${siteName}`);
 }
 

package/src/helpers/fetch-site-settings.mjs

@@ -27,7 +27,7 @@ import { transformGames, transformGamesJackpot } from "./processor/games.mjs";
 import { transformPayments } from "./processor/payment.mjs";
 import { transformProvider } from "./processor/providers.mjs";
 
-export const fetchSiteSettings = async (siteName) => {
+export const fetchSiteSettings = async (siteName, previewPath = null) => {
   const siteSettingsPromise = getSiteSettings(siteName);
   const ribbonsPromise = getRibbons(`site=${process.env.GATSBY_SITE_NAME}`);
 
@@ -60,7 +60,8 @@ export const fetchSiteSettings = async (siteName) => {
   const paymentPromise = getPayments(Object.keys(allMarketsData));
 
   const contentPromise = getContent(process.env.GATSBY_SITE_NAME);
-  const pagesPromise = getPages(process.env.GATSBY_SITE_NAME);
+
+  const pagesPromise = getPages(process.env.GATSBY_SITE_NAME, previewPath);
 
   let sportsPromise = Promise.resolve({});
   if(["rage_seo", "rage_ppc", "sports"].includes(siteSettingsData.general[siteId].type)) {

package/src/helpers/processor/index.mjs

@@ -458,7 +458,7 @@ export default {
             transformedPages[market][pageType][index].categories;
           transformedPages[market][pageType][index].categoryIds = categoryIds;
 
-          if (categoryIds.length) {
+          if (categoryIds && categoryIds.length) {
             transformedPages[market][pageType][index].categories =
               transformCategories(categoryIds, data);
           }
@@ -483,7 +483,7 @@ export default {
 
           const sectionList = postSectionsMap[page.relation_type];
 
-          sectionList &&
+          page.sections && sectionList &&
             sectionList.forEach((res) => {
               if (data.market_sections[market][res]) {
                 if (page.sections.main) {

package/src/helpers/processor/relations.mjs

@@ -21,8 +21,8 @@ export const processRelations = (
     const hasRelation =
       data.relations[page.relation_type] &&
       data.relations[page.relation_type].hasOwnProperty(page.relation_id);
-
-    transformedPages[market][isPreview ? "preview" : page.relation_type][
+    
+    transformedPages[market][page.relation_type][
       index
     ].relation = hasRelation
       ? cloneDeep(data.relations[page.relation_type][page.relation_id])

package/src/helpers/server-data.js

@@ -27,7 +27,7 @@ export async function getAPIData(page, url, headers, preview) {
       paymentData,
       gamesData,
       providersData,
-    } = await fetchSiteSettings(siteName, true);
+    } = await fetchSiteSettings(siteName, params?.path);
 
     const processed = processor.run(
       {