gatsby-core-theme 1.6.13 → 1.6.14

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.6.14](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.13...v1.6.14) (2021-12-01)
+
+
+### Bug Fixes
+
+* added clean up html tags in faq schema data ([0b9ae93](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0b9ae937928ede9f1f710ee0749108bf99b16757))
+* added clean up html tags in faq schema data ([1b22637](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1b22637bfadd48e9731e01d82b39e7db97e156ac))
+* added new cdn env var for gifs ([e5bb4bc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e5bb4bc6507688fbb8060a4df349fe5ff534a009))
+* geturl func ([c531ed3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c531ed335ae4e35aaa5b94010cb136d419826ac7))
+
+
+* Merge branch 'fix-gif-images' into 'master' ([0fd8aab](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0fd8aab0d3798b6487d0cc5a3d1a5a8c14d45c7f))
+
 ## [1.6.13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.12...v1.6.13) (2021-11-28)
 
 

package/package.json

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

package/src/helpers/getters.js

@@ -90,8 +90,15 @@ export function image(filename, width, height, fit = 'cover') {
   return `${cloudFrontUrl}/${Buffer.from(imageRequest).toString('base64')}`;
 }
 
+export function getImageExtension(filename) {
+  return filename && filename.split('.').pop();
+}
+
 export function imagePrettyUrl(filename = 'image.png', width = null, height = null) {
-  const cdnURL = process.env.IMAGE_CDN_URL || process.env.STORYBOOK_IMAGE_CDN_URL;
+  const cdnURL =
+    (getImageExtension(filename) === 'gif'
+      ? process.env.GIFS_CDN_URL
+      : process.env.IMAGE_CDN_URL) || process.env.STORYBOOK_IMAGE_CDN_URL;
 
   if (width && height) {
     const urlPath = '/fit-in';
@@ -262,7 +269,8 @@ export function getUrl(path) {
   if (path === '/') {
     return process.env.GATSBY_SITE_URL;
   }
-  return `${process.env.GATSBY_SITE_URL}${path}`;
+
+  return `${process.env.GATSBY_SITE_URL}${path.replace(/^\//, '')}`;
 }
 
 export function getLanguage(language) {

package/src/helpers/getters.test.js

@@ -68,6 +68,12 @@ describe('Getters Helper', () => {
     );
   });
 
+  test('getImageExtension()', () => {
+    expect(Getters.getImageExtension('photo.jpg')).toBeTruthy();
+    expect(Getters.getImageExtension('photo.jpg')).toEqual('jpg');
+    expect(Getters.getImageExtension(null)).toEqual(null);
+  });
+
   test('getPageImage()', () => {
     expect(
       Getters.getPageImage({ type: 'operator', relation: { default_logo_url: 'foo.jpg' } })
@@ -191,8 +197,9 @@ describe('Getters Helper', () => {
   });
 
   test('getUrl()', () => {
-    expect(Getters.getUrl('/')).toEqual('http://urltest.com');
+    expect(Getters.getUrl('/')).toEqual('http://urltest.com/');
     expect(Getters.getUrl('/games')).toEqual('http://urltest.com/games');
+    expect(Getters.getUrl('games')).toEqual('http://urltest.com/games');
   });
 
   test('getLanguage()', () => {

package/src/helpers/schema.js

@@ -1,4 +1,5 @@
 import { getGameRating, getUrl, getLanguage } from './getters';
+import { cleanHTML } from './strings';
 
 /* HardCoded Start */
 const isIL = process.env.GATSBY_SITE_NAME === 'Irishluck.ie';
@@ -178,9 +179,9 @@ export function moduleSchemas(modules) {
             '@type': 'Question',
             acceptedAnswer: {
               '@type': 'Answer',
-              text: item.answer,
+              text: cleanHTML(item.answer),
             },
-            name: item.question,
+            name: cleanHTML(item.question),
           })),
         };
 

package/src/helpers/schema.test.js

@@ -370,8 +370,9 @@ describe('Schema Helper', () => {
   test('schemaGenerator()', () => {
     const output = Schema.schemaGenerator({
       seo_json_schema: 'SEO JSON Schema',
-      breadcrumbs: [{}],
+      breadcrumbs: [{ path: '/test' }],
       type: 'article',
+      path: '/test-path',
       sections: { main: { modules: [{ name: 'faq' }] } },
     });
 

package/src/helpers/strings.js

@@ -51,3 +51,7 @@ export function truncateString(str, num, dots = '...') {
   trimmedString = trimmedString.substr(0, trimmedString.lastIndexOf(' '));
   return `${trimmedString}${dots}`;
 }
+
+export function cleanHTML(string) {
+  return string && string.replace(/(<([^>]+)>)/gi, '');
+}

package/src/helpers/strings.test.js

@@ -26,7 +26,11 @@ describe('Strings Helper', () => {
   });
 
   test('truncateString()', () => {
-    expect(Strings.truncateString('hello i think',5)).toEqual('hello...');
-    expect(Strings.truncateString('hello i think',10)).toEqual('hello i...');
+    expect(Strings.truncateString('hello i think', 5)).toEqual('hello...');
+    expect(Strings.truncateString('hello i think', 10)).toEqual('hello i...');
+  });
+
+  test('cleanHTML()', () => {
+    expect(Strings.cleanHTML('<p>hello <a>i</a> think</p>')).toEqual('hello i think');
   });
 });

package/tests/envVars.js

@@ -1,5 +1,5 @@
 process.env.GATSBY_SITE_NAME = 'norskespilleautomater.com';
-process.env.GATSBY_SITE_URL = 'http://urltest.com';
+process.env.GATSBY_SITE_URL = 'http://urltest.com/';
 process.env.IMAGE_CDN_URL = 'https://cdn.images.com';
 process.env.TRACKER_LINK_FORMAT_MAIN = '[no],[visit],short_name';
 process.env.TRACKER_LINK_FORMAT_NON_MAIN = '[no],[visit],short_name,type,[tracker]';