@times-components/ssr 2.59.38-8c13d97039c1ee721b5b9dbe12709bb98cd93d3d.2 → 2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@times-components/ssr",
   "main": "src",
-  "version": "2.59.38-8c13d97039c1ee721b5b9dbe12709bb98cd93d3d.2+8c13d97039",
+  "version": "2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4+c3f77517b3",
   "scripts": {
     "bundle:dev": "yarn cleanup-dist && webpack --config=webpack.config.js",
     "bundle:prod": "yarn cleanup-dist && NODE_ENV=production webpack --config=webpack.config.js -p",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c13d97039c1ee721b5b9dbe12709bb98cd93d3d"
+  "gitHead": "c3f77517b357963002e883f8cb03f662f312dfb1"
 }

package/src/lib/affiliate-links-validation.js

@@ -3,11 +3,15 @@ const {
   travelSiteCode,
   trackonomicsRegex
 } = require("../constants/affiliate-links-validation");
-/* const { wrapSkimlinks } = require("./skimlinks-wrapping"); */
+const {
+  wrapSkimlinks,
+  fetchSkimlinksDomains,
+  filterDomains
+} = require("./skimlinks-wrapping");
 
 const isAffiliateLink = url => trackonomicsRegex.test(url);
 
-const wrapAffiliateLink = (affiliateUrl, contentPageUrl) => {
+const wrapAffiliateLink = (affiliateLink, contentPageUrl, filteredDomains) => {
   const wrapTrackonomics = trackonomicsUrl => {
     if (!isAffiliateLink(trackonomicsUrl)) {
       return trackonomicsUrl;
@@ -25,14 +29,20 @@ const wrapAffiliateLink = (affiliateUrl, contentPageUrl) => {
     return affiliateWrapper;
   };
 
-  /* const skimlinksUrl = wrapSkimlinks(affiliateLink, contentPageUrl); */
-  return wrapTrackonomics(affiliateUrl);
+  const skimlinksUrl = wrapSkimlinks(
+    affiliateLink,
+    contentPageUrl,
+    filteredDomains
+  );
+  return wrapTrackonomics(skimlinksUrl);
 };
 
-module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
+const affiliateLinksValidation = async (children, articleDataFromRender) => {
   const clonedChildren = [...children];
   const { canonicalUrl, hostName } = articleDataFromRender;
   const contentPageUrl = `${hostName}${canonicalUrl}`;
+  const skimlinksDomains = await fetchSkimlinksDomains();
+  const filteredDomains = filterDomains(skimlinksDomains);
 
   const checkAndSetLinkTarget = elements =>
     elements.map(el => {
@@ -66,7 +76,7 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                url: wrapAffiliateLink(href, contentPageUrl)
+                url: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
               }
             };
           } else {
@@ -75,7 +85,7 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                href: wrapAffiliateLink(href, contentPageUrl)
+                href: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
               }
             };
           }
@@ -91,3 +101,5 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
 
   return checkAndSetLinkTarget(clonedChildren);
 };
+
+module.exports = { affiliateLinksValidation };

package/src/lib/skimlinks-wrapping.js

@@ -66,9 +66,7 @@ const constructSkimlinksUrl = (merchantUrl, contentPageUrl) => {
   return skimlinksWrapper;
 };
 
-const wrapSkimlinks = async (url, contentPageUrl) => {
-  const data = await fetchSkimlinksDomains();
-  const filteredDomains = filterDomains(data);
+const wrapSkimlinks = (url, contentPageUrl, filteredDomains) => {
   const skimlinksRegex = createDomainRegex(filteredDomains);
 
   if (skimlinksRegex.test(url)) {
@@ -79,5 +77,7 @@ const wrapSkimlinks = async (url, contentPageUrl) => {
 };
 
 module.exports = {
-  wrapSkimlinks
+  wrapSkimlinks,
+  fetchSkimlinksDomains,
+  filterDomains
 };