@times-components/ssr 2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4 → 2.59.38-ead701343e666ee07c63d76a718327484fe4d06e.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@times-components/ssr",
   "main": "src",
-  "version": "2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4+c3f77517b3",
+  "version": "2.59.38-ead701343e666ee07c63d76a718327484fe4d06e.0+ead701343e",
   "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": "c3f77517b357963002e883f8cb03f662f312dfb1"
+  "gitHead": "ead701343e666ee07c63d76a718327484fe4d06e"
 }

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

@@ -3,15 +3,11 @@ const {
   travelSiteCode,
   trackonomicsRegex
 } = require("../constants/affiliate-links-validation");
-const {
-  wrapSkimlinks,
-  fetchSkimlinksDomains,
-  filterDomains
-} = require("./skimlinks-wrapping");
+const { wrapSkimlinks } = require("./skimlinks-wrapping");
 
 const isAffiliateLink = url => trackonomicsRegex.test(url);
 
-const wrapAffiliateLink = (affiliateLink, contentPageUrl, filteredDomains) => {
+const wrapAffiliateLink = (affiliateLink, contentPageUrl) => {
   const wrapTrackonomics = trackonomicsUrl => {
     if (!isAffiliateLink(trackonomicsUrl)) {
       return trackonomicsUrl;
@@ -29,20 +25,14 @@ const wrapAffiliateLink = (affiliateLink, contentPageUrl, filteredDomains) => {
     return affiliateWrapper;
   };
 
-  const skimlinksUrl = wrapSkimlinks(
-    affiliateLink,
-    contentPageUrl,
-    filteredDomains
-  );
+  const skimlinksUrl = wrapSkimlinks(affiliateLink, contentPageUrl);
   return wrapTrackonomics(skimlinksUrl);
 };
 
-const affiliateLinksValidation = async (children, articleDataFromRender) => {
+module.exports.affiliateLinksValidation = (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 => {
@@ -76,7 +66,7 @@ const affiliateLinksValidation = async (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                url: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
+                url: wrapAffiliateLink(href, contentPageUrl)
               }
             };
           } else {
@@ -85,7 +75,7 @@ const affiliateLinksValidation = async (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                href: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
+                href: wrapAffiliateLink(href, contentPageUrl)
               }
             };
           }
@@ -101,5 +91,3 @@ const affiliateLinksValidation = async (children, articleDataFromRender) => {
 
   return checkAndSetLinkTarget(clonedChildren);
 };
-
-module.exports = { affiliateLinksValidation };

package/src/lib/skimlinks-wrapping.js

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