gatsby-matrix-theme 53.7.0 → 53.7.1

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [53.7.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.7.0...v53.7.1) (2025-12-04)
+
+
+### Bug Fixes
+
+* search accent sensitivity ([aba1d5c](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/aba1d5c39f0ef6af5ea976b4b48d3dcba81ed580))
+* update gatsby theme version ([2870bd4](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/2870bd40884a5c2be88b83a1478ab24ce6c666ca))
+
+
+* Merge branch 'en-145-search-accent-sensitivity' into 'master' ([0c94845](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/0c94845d49714419b4a31fd5c5e45077be2e91f2))
+
 # [53.7.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.6.0...v53.7.0) (2025-11-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "53.7.0",
+  "version": "53.7.1",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "44.9.1",
+    "gatsby-core-theme": "44.9.2",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^6.13.1",

package/src/gatsby-core-theme/helpers/server-data.js

@@ -7,18 +7,22 @@ import processor from 'gatsby-core-theme/src/resolver/index';
 import { fetchSiteSettings } from 'gatsby-core-theme/src/services/fetch.mjs';
 import { getApiQueryParams } from './sportstake';
 import { getApiBasedNames } from './lotto';
-import { getResultsById, getLatestResults, getAvailableDrawDays, getLottoUKdata, getCalendarData } from './services';
+import {
+  getResultsById,
+  getLatestResults,
+  getAvailableDrawDays,
+  getLottoUKdata,
+  getCalendarData,
+} from './services';
 import loadSource from '~helpers/search-source';
 import { deparam } from '~helpers/strings';
 import { groupBy } from '~helpers/getters';
 
-
 export async function getAPIData(page, url, header, preview) {
-
   if (preview) {
     const start = new Date();
     const siteName = process.env.GATSBY_SITE_NAME;
-    const params = deparam(url.split("?")[1]);
+    const params = deparam(url.split('?')[1]);
 
     const {
       siteSettingsData,
@@ -65,15 +69,11 @@ export async function getAPIData(page, url, header, preview) {
       const previewPageData = pagePreviewProcessed[0];
       const end = new Date() - start;
 
-      console.log(
-        chalk.green("success") + chalk.whiteBright(` Preview Feature - %ds`),
-        end / 1000
-      );
+      console.log(chalk.green('success') + chalk.whiteBright(` Preview Feature - %ds`), end / 1000);
       return {
         props: {
           marketSections: processed.market_sections[previewPageData.market],
-          prefilledModules:
-            processed.prefilled_market_modules[previewPageData.market],
+          prefilledModules: processed.prefilled_market_modules[previewPageData.market],
           page: previewPageData,
           allMarkets: processed.site_markets,
           siteInfo: processed.general,
@@ -81,14 +81,17 @@ export async function getAPIData(page, url, header, preview) {
       };
     }
 
-    console.log(
-      chalk.red("error") +
-        chalk.whiteBright(` Preview Page Not Found ${params?.path}`)
-    );
+    console.log(chalk.red('error') + chalk.whiteBright(` Preview Page Not Found ${params?.path}`));
 
     return { props: {} };
   }
 
+  function normalizeString(str) {
+    return str
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .toLowerCase();
+  }
 
   if (page.path.endsWith('/s') || page.path === 's' || page.template === 'search') {
     const results = await loadSource(page.market);
@@ -102,7 +105,7 @@ export async function getAPIData(page, url, header, preview) {
         ? urlParams.hasOwnProperty('s')
           ? groupBy(
               results.filter((item) =>
-                item.title.toLowerCase().includes(urlParams.s.toLowerCase())
+                normalizeString(item.title).includes(normalizeString(urlParams.s))
               ),
               'pageType'
             )
@@ -135,15 +138,24 @@ export async function getAPIData(page, url, header, preview) {
     'sportstakerugbyfixturesweekend',
     'lotto',
     'daily_lotto',
-    'powerball'
+    'powerball',
   ];
 
-  const containsFixtures = (page?.categories && page?.categories.filter((category) => category.short_name === 'fixtures')) || [];
-  const containsResults = (page?.categories && page?.categories.filter((category) => category.short_name === 'results')) || [];
-  const containsLotto = (page?.categories && page?.categories.filter((category) => category.short_name === 'lotto')) || [];
-  const conatinsLottoUK49 = (page?.categories && page?.categories.filter(
-    (category) => category.short_name === 'lotto_uk_49'
-  )) || [];
+  const containsFixtures =
+    (page?.categories &&
+      page?.categories.filter((category) => category.short_name === 'fixtures')) ||
+    [];
+  const containsResults =
+    (page?.categories &&
+      page?.categories.filter((category) => category.short_name === 'results')) ||
+    [];
+  const containsLotto =
+    (page?.categories && page?.categories.filter((category) => category.short_name === 'lotto')) ||
+    [];
+  const conatinsLottoUK49 =
+    (page?.categories &&
+      page?.categories.filter((category) => category.short_name === 'lotto_uk_49')) ||
+    [];
   let responseFixtures = {};
   let responseResults = {};
   let responseLotto = {};
@@ -155,50 +167,54 @@ export async function getAPIData(page, url, header, preview) {
     );
 
     const date = new Date();
-    const fixtureData = 
-    await Promise.all(
+    const fixtureData = await Promise.all(
       filteredArray.map(async (module) => {
         const moduleName = module.name;
         // return if fixtures to avoid duplicates
         if (moduleName.includes('results')) return;
         const query = getApiQueryParams(moduleName);
-        const month =  date.getMonth() + 1;
+        const month = date.getMonth() + 1;
         const previousMonth = month === 1 ? 12 : month - 1;
 
         const calendarData = await getCalendarData(query.lotteryName, month, date.getFullYear());
 
-        const prevMonth = (calendarData.length <= 2) ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear()) : [];
+        const prevMonth =
+          calendarData.length <= 2
+            ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear())
+            : [];
 
-        const orderedPrevMonth = calendarData.length === 0 ? 
-          [
-            prevMonth[prevMonth.length - 1],
-            ...prevMonth.slice(0, prevMonth.length - 1),
-          ] : prevMonth;
+        const orderedPrevMonth =
+          calendarData.length === 0
+            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
+            : prevMonth;
 
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
-          ...orderedPrevMonth
-        ].filter(item => item && !Array.isArray(item));
-        
+          ...orderedPrevMonth,
+        ].filter((item) => item && !Array.isArray(item));
+
         reorderedResultData.sort((a, b) => {
           const dateA = new Date(a.drawDate);
           const dateB = new Date(b.drawDate);
           return dateB.getTime() - dateA.getTime();
         });
 
-        // eslint-disable-next-line no-underscore-dangle
-        reorderedResultData[0] = reorderedResultData[0] ? await getResultsById(reorderedResultData[0]._id) : {};
+        reorderedResultData[0] = reorderedResultData[0]
+          ? // eslint-disable-next-line no-underscore-dangle
+            await getResultsById(reorderedResultData[0]._id)
+          : {};
 
         return { [moduleName]: reorderedResultData };
-        
-      })    
+      })
     );
 
     responseFixtures = {
       data: Object.assign({}, ...fixtureData.filter(Boolean)),
     };
-  }else{ responseFixtures = { data: [] }; }
+  } else {
+    responseFixtures = { data: [] };
+  }
 
   if (containsResults.length >= 1) {
     const filteredArray = page?.sections?.main?.modules.filter(
@@ -206,33 +222,34 @@ export async function getAPIData(page, url, header, preview) {
     );
 
     const date = new Date();
-    const resultData = 
-    await Promise.all(
+    const resultData = await Promise.all(
       filteredArray.map(async (module) => {
         const moduleName = module.name;
         // return if fixtures to avoid duplicates
         if (moduleName.includes('fixtures')) return;
         const query = getApiQueryParams(moduleName);
-        const month =  date.getMonth() + 1;
+        const month = date.getMonth() + 1;
         const previousMonth = month === 1 ? 12 : month - 1;
-        
+
         const calendarData = await getCalendarData(query.lotteryName, month, date.getFullYear());
 
-        if(!calendarData) return;
+        if (!calendarData) return;
 
-        const prevMonth = (calendarData.length <= 2) ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear()) : [];
+        const prevMonth =
+          calendarData.length <= 2
+            ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear())
+            : [];
 
-        const orderedPrevMonth = calendarData.length === 0 ? 
-          [
-            prevMonth[prevMonth.length - 1],
-            ...prevMonth.slice(0, prevMonth.length - 1),
-          ] : prevMonth;
+        const orderedPrevMonth =
+          calendarData.length === 0
+            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
+            : prevMonth;
 
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
-          ...orderedPrevMonth
-        ].filter(item => item && !Array.isArray(item));
+          ...orderedPrevMonth,
+        ].filter((item) => item && !Array.isArray(item));
 
         reorderedResultData.sort((a, b) => {
           const dateA = new Date(a.drawDate);
@@ -240,17 +257,21 @@ export async function getAPIData(page, url, header, preview) {
           return dateB.getTime() - dateA.getTime();
         });
 
-        // eslint-disable-next-line no-underscore-dangle
-        reorderedResultData[0] = reorderedResultData[0] ? await getResultsById(reorderedResultData[0]._id) : null;
+        reorderedResultData[0] = reorderedResultData[0]
+          ? // eslint-disable-next-line no-underscore-dangle
+            await getResultsById(reorderedResultData[0]._id)
+          : null;
 
         return { [moduleName]: reorderedResultData };
-      })    
+      })
     );
 
     responseResults = {
       data: Object.assign({}, ...resultData.filter(Boolean)),
     };
-  }else{ responseResults = { data: [] }; }
+  } else {
+    responseResults = { data: [] };
+  }
 
   if (containsLotto.length >= 1) {
     const filteredArray = page?.sections?.main?.modules.filter(
@@ -262,41 +283,32 @@ export async function getAPIData(page, url, header, preview) {
         const moduleName = module.name;
         const apiBaseNames = getApiBasedNames(moduleName);
 
-        if(apiBaseNames.length === 0) return;
+        if (apiBaseNames.length === 0) return;
 
         const date = new Date();
-        const month =  date.getMonth() + 1;
+        const month = date.getMonth() + 1;
         const previousMonth = month === 1 ? 12 : month - 1;
         const year = date.getFullYear();
 
-        const availableDates = await getAvailableDrawDays(
-          apiBaseNames[0],
-          'WEEKEND',
-          month,
-          year
-        );
+        const availableDates = await getAvailableDrawDays(apiBaseNames[0], 'WEEKEND', month, year);
 
-        if(!availableDates) return;
+        if (!availableDates) return;
 
-        const prevMonth = (availableDates.length <= 2) ? await getAvailableDrawDays(
-          apiBaseNames[0],
-          'WEEKEND',
-          previousMonth, 
-          year
-        ) : [];
+        const prevMonth =
+          availableDates.length <= 2
+            ? await getAvailableDrawDays(apiBaseNames[0], 'WEEKEND', previousMonth, year)
+            : [];
 
-        const orderedPrevMonth = availableDates.length === 0 ? 
-          [
-            prevMonth[prevMonth.length - 1],
-            ...prevMonth.slice(0, prevMonth.length - 1),
-          ] : prevMonth;
-        
+        const orderedPrevMonth =
+          availableDates.length === 0
+            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
+            : prevMonth;
 
         const reorderedDates = [
           availableDates[availableDates.length - 1],
           ...availableDates.slice(0, availableDates.length - 1),
-          ...orderedPrevMonth
-        ].filter(item => item && !Array.isArray(item));
+          ...orderedPrevMonth,
+        ].filter((item) => item && !Array.isArray(item));
 
         reorderedDates.sort((a, b) => {
           const dateA = new Date(a.drawDate);
@@ -315,38 +327,41 @@ export async function getAPIData(page, url, header, preview) {
     responseLotto = {
       data: responseArray.filter((n) => n),
     };
-  }else{ responseLotto = { data: [] }; }
+  } else {
+    responseLotto = { data: [] };
+  }
 
   if (conatinsLottoUK49.length >= 1) {
     const types = ['lunchtime', 'teatime'];
     const date = new Date();
-    const month =  date.getMonth() + 1;
+    const month = date.getMonth() + 1;
     const previousMonth = month === 1 ? 12 : month - 1;
     const year = date.getFullYear();
 
     const responseArray = await Promise.all(
-
       types.map(async (type) => {
         const data = await getLottoUKdata(true, false, type);
         const calendarData = await getCalendarData(type, month, year);
-        const prevMonth = (calendarData.length <= 2) ? await getCalendarData(type, previousMonth, year) : [];
+        const prevMonth =
+          calendarData.length <= 2 ? await getCalendarData(type, previousMonth, year) : [];
 
-        const reorderedDates = [
-          ...calendarData,
-          ...prevMonth
-        ].filter(item => item && !Array.isArray(item));
+        const reorderedDates = [...calendarData, ...prevMonth].filter(
+          (item) => item && !Array.isArray(item)
+        );
 
         return {
           data,
-          tabs: reorderedDates
+          tabs: reorderedDates,
         };
       })
     );
     lottoUK49 = {
-      tabs:[...responseArray[0].tabs, ...responseArray[1].tabs],
-      data: [...responseArray[0].data, ...responseArray[1].data]
-    } 
-  }else{ lottoUK49 = { data: [], tabs: [] }; }
+      tabs: [...responseArray[0].tabs, ...responseArray[1].tabs],
+      data: [...responseArray[0].data, ...responseArray[1].data],
+    };
+  } else {
+    lottoUK49 = { data: [], tabs: [] };
+  }
 
   return {
     props: {