@reuters-graphics/graphics-components 0.0.18 → 0.0.20

package/dist/components/SEO/SEO.svelte

@@ -81,10 +81,16 @@ const getOrigin = (baseUrl) => {
 };
 $: origin = getOrigin(baseUrl);
 $: canonicalUrl = origin + pageUrl.pathname;
+let hasEnabledPublisherTags = false;
 // Only fire analytics on prod sites
-if (typeof window !== 'undefined' && includeAnalytics) {
-    analytics(canonicalUrl, seoTitle);
-    publisherTags();
+$: {
+    if (typeof window !== 'undefined' && includeAnalytics) {
+        analytics(canonicalUrl, seoTitle);
+        if (!hasEnabledPublisherTags) {
+            publisherTags();
+            hasEnabledPublisherTags = true;
+        }
+    }
 }
 const orgLdJson = {
     '@context': 'http://schema.org',
@@ -99,7 +105,7 @@ const orgLdJson = {
     },
     url: 'https://www.reuters.com/',
 };
-const articleLdJson = {
+$: articleLdJson = {
     '@context': 'http://schema.org',
     '@type': 'NewsArticle',
     headline: seoTitle,
@@ -136,64 +142,66 @@ const articleLdJson = {
 </script>
 
 <svelte:head>
-  <title>{seoTitle}</title>
-  <meta name="description" content="{seoDescription}" />
-  <link rel="canonical" href="{canonicalUrl}" />
-  <link
-    rel="shortcut icon"
-    type="image/x-icon"
-    href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon.ico"
-  />
-  <link
-    rel="icon"
-    type="image/png"
-    href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon-16x16.png"
-    sizes="16x16"
-  />
-  <link
-    rel="icon"
-    type="image/png"
-    href="https://s1.reutersmedia.net/resources_v2/images/favicon/favicon-32x32.png"
-    sizes="32x32"
-  />
-  <link
-    rel="icon"
-    type="image/png"
-    href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon-96x96.png"
-    sizes="96x96"
-  />
+  {#key canonicalUrl}
+    <title>{seoTitle}</title>
+    <meta name="description" content="{seoDescription}" />
+    <link rel="canonical" href="{canonicalUrl}" />
+    <link
+      rel="shortcut icon"
+      type="image/x-icon"
+      href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon.ico"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon-16x16.png"
+      sizes="16x16"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      href="https://s1.reutersmedia.net/resources_v2/images/favicon/favicon-32x32.png"
+      sizes="32x32"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      href="https://s3.reutersmedia.net/resources_v2/images/favicon/favicon-96x96.png"
+      sizes="96x96"
+    />
 
-  <meta property="og:url" content="{canonicalUrl}" />
-  <meta property="og:type" content="article" />
-  <meta property="og:title" content="{shareTitle}" itemprop="name" />
-  <meta
-    property="og:description"
-    content="{shareDescription}"
-    itemprop="description"
-  />
-  <meta property="og:image" content="{shareImgPath}" itemprop="image" />
-  <meta property="og:site_name" content="Reuters" />
+    <meta property="og:url" content="{canonicalUrl}" />
+    <meta property="og:type" content="article" />
+    <meta property="og:title" content="{shareTitle}" itemprop="name" />
+    <meta
+      property="og:description"
+      content="{shareDescription}"
+      itemprop="description"
+    />
+    <meta property="og:image" content="{shareImgPath}" itemprop="image" />
+    <meta property="og:site_name" content="Reuters" />
 
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:site" content="@ReutersGraphics" />
-  <meta name="twitter:creator" content="@ReutersGraphics" />
-  <meta name="twitter:domain" content="{origin}" />
-  <meta name="twitter:title" content="{shareTitle}" />
-  <meta name="twitter:description" content="{shareDescription}" />
-  <meta name="twitter:image" content="{shareImgPath}" />
-  {#if shareImgAlt}
-    <meta name="twitter:image:alt" content="{shareImgAlt}" />
-  {/if}
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@ReutersGraphics" />
+    <meta name="twitter:creator" content="@ReutersGraphics" />
+    <meta name="twitter:domain" content="{origin}" />
+    <meta name="twitter:title" content="{shareTitle}" />
+    <meta name="twitter:description" content="{shareDescription}" />
+    <meta name="twitter:image" content="{shareImgPath}" />
+    {#if shareImgAlt}
+      <meta name="twitter:image:alt" content="{shareImgAlt}" />
+    {/if}
 
-  <meta property="fb:app_id" content="319194411438328" />
-  <meta property="fb:admins" content="616167736" />
-  <meta property="fb:admins" content="625796953" />
-  <meta property="fb:admins" content="571759798" />
+    <meta property="fb:app_id" content="319194411438328" />
+    <meta property="fb:admins" content="616167736" />
+    <meta property="fb:admins" content="625796953" />
+    <meta property="fb:admins" content="571759798" />
 
-  {@html `<${'script'} type="application/ld+json">${JSON.stringify(
-    orgLdJson
-  )}</script>`}
-  {@html `<${'script'} type="application/ld+json">${JSON.stringify(
-    articleLdJson
-  )}</script>`}
+    {@html `<${'script'} type="application/ld+json">${JSON.stringify(
+      orgLdJson
+    )}</script>`}
+    {@html `<${'script'} type="application/ld+json">${JSON.stringify(
+      articleLdJson
+    )}</script>`}
+  {/key}
 </svelte:head>

package/dist/components/SEO/analytics.js

@@ -16,32 +16,32 @@ const attachScript = function (i, s, o, g, r, a, m) {
 /* eslint-enable */
 
 export default (page, title) => {
-  attachScript(
-    window,
-    document,
-    'script',
-    'https://www.google-analytics.com/analytics.js',
-    'ga'
-  );
-
-  window.ga('create', 'UA-41619329-3', { cookieDomain: 'auto' });
-  window.ga('require', 'linkid', 'linkid.js');
+  if (!window.ga) {
+    attachScript(
+      window,
+      document,
+      'script',
+      'https://www.google-analytics.com/analytics.js',
+      'ga'
+    );
+
+    window.ga('create', 'UA-41619329-3', { cookieDomain: 'auto' });
+    window.ga('require', 'linkid', 'linkid.js');
+  }
+
   window.ga('send', 'pageview', {
     page,
     title,
   });
 
   if (!inIframe()) {
-    //start time on page tracking if not in an iframe
+    // start time on page tracking if not in an iframe
     riveted.init({
       reportInterval: 30,
     });
   }
 };
 
-
-
-
 // checks if page is in an iframe
 function inIframe() {
   try {
@@ -51,28 +51,27 @@ function inIframe() {
   }
 }
 
-
 /*
  * START: Riveted time on page tracking code
  * see aditional documentation here: https://riveted.parsnip.io/
  */
-
+/* eslint-disable */
 var riveted = (function () {
-  var started = false;
-  var stopped = false;
-  var turnedOff = false;
-  var clockTime = 0;
-  var startTime = new Date();
-  var clockTimer = null;
-  var idleTimer = null;
-  var sendEvent;
-  var sendUserTiming;
-  var reportInterval;
-  var idleTimeout;
-  var nonInteraction;
-  var universalGA;
-  var classicGA;
-  var googleTagManager;
+  let started = false;
+  let stopped = false;
+  let turnedOff = false;
+  let clockTime = 0;
+  const startTime = new Date();
+  let clockTimer = null;
+  let idleTimer = null;
+  let sendEvent;
+  let sendUserTiming;
+  let reportInterval;
+  let idleTimeout;
+  let nonInteraction;
+  let universalGA;
+  let classicGA;
+  let googleTagManager;
 
   function init(options) {
     /*
@@ -126,8 +125,8 @@ var riveted = (function () {
     // Page visibility listeners
     addListener(document, 'visibilitychange', visibilityChange);
     addListener(document, 'webkitvisibilitychange', visibilityChange);
-    
-    //sends initial zero value
+
+    // sends initial zero value
     sendEvent(0);
   }
 
@@ -140,18 +139,18 @@ var riveted = (function () {
    */
 
   function throttle(func, wait) {
-    var context, args, result;
-    var timeout = null;
-    var previous = 0;
-    var later = function () {
+    let context, args, result;
+    let timeout = null;
+    let previous = 0;
+    const later = function () {
       previous = new Date();
       timeout = null;
       result = func.apply(context, args);
     };
     return function () {
-      var now = new Date();
+      const now = new Date();
       if (!previous) previous = now;
-      var remaining = wait - (now - previous);
+      const remaining = wait - (now - previous);
       context = this;
       args = arguments;
       if (remaining <= 0) {
@@ -190,7 +189,7 @@ var riveted = (function () {
         event: 'RivetedTiming',
         eventCategory: 'Riveted',
         timingVar: 'First Interaction',
-        timingValue: timingValue,
+        timingValue,
       });
     } else {
       if (universalGA) {
@@ -233,7 +232,7 @@ var riveted = (function () {
           'Time Spent',
           time.toString(),
           reportInterval,
-          { nonInteraction: nonInteraction }
+          { nonInteraction }
         );
       }
 
@@ -290,8 +289,8 @@ var riveted = (function () {
 
   function startRiveted() {
     // Calculate seconds from start to first interaction
-    var currentTime = new Date();
-    var diff = currentTime - startTime;
+    const currentTime = new Date();
+    const diff = currentTime - startTime;
 
     // Set global
     started = true;
@@ -321,12 +320,12 @@ var riveted = (function () {
   }
 
   return {
-    init: init,
-    trigger: trigger,
-    setIdle: setIdle,
+    init,
+    trigger,
+    setIdle,
     on: turnOn,
     off: turnOff,
   };
 })();
-
+/* eslint-enable */
 /* END: Riveted time on page tracking code */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reuters-graphics/graphics-components",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "private": false,
   "homepage": "https://reuters-graphics.github.io/graphics-components",