gatsby-core-theme 2.0.15 → 2.0.16

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.0.16](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.15...v2.0.16) (2022-01-05)
+
+
+### Bug Fixes
+
+* update-placeholder-generation-with-title ([92e3cf2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/92e3cf2663345ddaffb040504f4830d445d2f73c))
+
+
+* Merge branch 'hotfix-update-placeholder-generation-with-title' into 'master' ([44d05d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44d05d648d49bdb2d5776d7133e3b569ac1f6353))
+
 ## [2.0.15](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.14...v2.0.15) (2022-01-05)
 
 

package/gatsby-node.esm.js

@@ -5,7 +5,7 @@
 import { cloneDeep, chunk, pick } from 'lodash';
 import chalk from 'chalk';
 import { getData, getLocalData } from './src/helpers/api';
-import { generateMetaString, generateTrackerLink } from './src/helpers/generators';
+import { generatePlaceholderString, generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
 
@@ -204,16 +204,22 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           pick(authors[key], pickAuthorsPageKeys)
         );
 
-        // replacing meta placehoders with year, month, date, etc.
+        // replacing string placehoders with year, month, date, etc.
+        page.title =
+          page.title &&
+          generatePlaceholderString(page.title, translations, {
+            siteName: response.general.site_name,
+            siteTitle: page.title,
+          });
         page.meta_title =
           page.meta_title &&
-          generateMetaString(page.meta_title, translations, {
+          generatePlaceholderString(page.meta_title, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });
         page.meta_description =
           page.meta_description &&
-          generateMetaString(page.meta_description, translations, {
+          generatePlaceholderString(page.meta_description, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/helpers/generators.js

@@ -21,7 +21,7 @@ export function generateTrackerLink(operator, trackerType) {
   }
 }
 
-export function generateMetaString(metaString, translations, props) {
+export function generatePlaceholderString(string, translations, props) {
   const date = new Date();
   const day = date.getDate();
   const month = months[date.getMonth()];
@@ -29,7 +29,7 @@ export function generateMetaString(metaString, translations, props) {
   const regex =
     /\[MONTH\]|\[YEAR\]|\[currentyear\]|\[sitename\]|\[currentmonth\]|\[title\]|\[currentdate\]/gi;
 
-  return metaString.replace(
+  return string.replace(
     regex,
     (match) =>
       ({

package/src/helpers/generators.test.js

@@ -1,4 +1,4 @@
-import { generateTrackerLink, generateMetaString } from './generators';
+import { generateTrackerLink, generatePlaceholderString } from './generators';
 import { months } from '~constants/common';
 
 describe('Generate Tracker Link Helper', () => {
@@ -16,19 +16,19 @@ describe('Generate Tracker Link Helper', () => {
   });
 });
 
-describe('Generate Meta Title Helper', () => {
-  test('generateMetaString uppercase', () => {
-    const metaString = generateMetaString('meta title [MONTH] [YEAR]');
+describe('Generate Placeholders String', () => {
+  test('generatePlaceholderString uppercase', () => {
+    const string = generatePlaceholderString('Some title [MONTH] [YEAR]');
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).not.toContain('[YEAR]');
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain(months[date.getMonth()]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).not.toContain('[YEAR]');
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain(months[date.getMonth()]);
   });
-  test('generateMetaString lowercase', () => {
-    const metaString = generateMetaString(
-      'meta title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
+  test('generatePlaceholderString lowercase', () => {
+    const string = generatePlaceholderString(
+      'Some title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
       null,
       {
         siteName: 'Site Name',
@@ -37,26 +37,26 @@ describe('Generate Meta Title Helper', () => {
     );
     const date = new Date();
 
-    expect(metaString).not.toContain('[currentdate]');
-    expect(metaString).not.toContain('[currentmonth]');
-    expect(metaString).not.toContain('[currentyear]');
-    expect(metaString).not.toContain('[sitename]');
-    expect(metaString).not.toContain('[title]');
-    expect(metaString).toContain(date.getDate());
-    expect(metaString).toContain(months[date.getMonth()]);
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain('Site Name');
-    expect(metaString).toContain('Site Title');
+    expect(string).not.toContain('[currentdate]');
+    expect(string).not.toContain('[currentmonth]');
+    expect(string).not.toContain('[currentyear]');
+    expect(string).not.toContain('[sitename]');
+    expect(string).not.toContain('[title]');
+    expect(string).toContain(date.getDate());
+    expect(string).toContain(months[date.getMonth()]);
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain('Site Name');
+    expect(string).toContain('Site Title');
   });
-  test('generateMetaString translated', () => {
+  test('generatePlaceholderString translated', () => {
     const translateMonths = months.reduce(
       (translated, month) => ({ ...translated, [month]: `translate${month.substring(0, 1)}` }),
       {}
     );
-    const metaString = generateMetaString('meta title [MONTH]', translateMonths);
+    const string = generatePlaceholderString('Some title [MONTH]', translateMonths);
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).toContain(translateMonths[months[date.getMonth()]]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).toContain(translateMonths[months[date.getMonth()]]);
   });
 });