@reuters-graphics/graphics-components 3.0.15 → 3.0.17

package/dist/components/Analytics/Analytics.svelte

@@ -1,6 +1,10 @@
 <!-- @component `Analytics` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-ads-analytics-analytics--docs) -->
 
 <script module>
+  // GTM configuration
+  const GTM_ID = 'GTM-P9TTSWG2';
+  const GTM_SCRIPT = `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','${GTM_ID}');`;
+
   import { registerPageview as registerChartbeatPageview } from './providers/chartbeat';
   import { registerPageview as registerGAPageview } from './providers/ga';
 
@@ -34,3 +38,21 @@
     chartbeat(authors);
   });
 </script>
+
+<svelte:head>
+  <!-- Google Tag Manager -->
+  {@html `<${'script'}>${GTM_SCRIPT}</script>`}
+  <!-- End Google Tag Manager -->
+</svelte:head>
+
+<!-- Google Tag Manager (noscript) -->
+<noscript>
+  <iframe
+    src="https://www.googletagmanager.com/ns.html?id={GTM_ID}"
+    height="0"
+    width="0"
+    style="display:none;visibility:hidden"
+    title=""
+  ></iframe>
+</noscript>
+<!-- End Google Tag Manager (noscript) -->

package/dist/components/Analytics/providers/chartbeat.js

@@ -1,18 +1,5 @@
 // Reuters Chartbeat UID
 const UID = 52639;
-const URL = '//static.chartbeat.com/js/chartbeat.js';
-const attachScript = () => {
-    // If script is already attached, skip
-    if (document.querySelector(`script[src="${URL}"]`))
-        return;
-    // ... else attach it.
-    const e = document.createElement('script');
-    const n = document.getElementsByTagName('script')[0];
-    e.type = 'text/javascript';
-    e.async = true;
-    e.src = URL;
-    n.parentNode.insertBefore(e, n);
-};
 export default (authors) => {
     window._sf_async_config = {
         uid: UID,
@@ -24,12 +11,6 @@ export default (authors) => {
         authors: authors.map((a) => a?.name || '').join(','),
         ...(window._sf_async_config || {}),
     };
-    try {
-        attachScript();
-    }
-    catch (e) {
-        console.warn(`Error initialising Chartbeat Analytics: ${e}`);
-    }
 };
 export const registerPageview = () => {
     if (typeof window === 'undefined' || !window.pSUPERFLY)

package/dist/components/Analytics/providers/ga.js

@@ -1,23 +1,9 @@
 // Reuters Google Tag ID
 const GOOGLE_TAG_ID = 'G-WBSR7WLTGD';
-const URL = `https://www.googletagmanager.com/gtag/js?id=${GOOGLE_TAG_ID}`;
-const attachScript = () => {
-    // If script is already attached, skip
-    if (document.querySelector(`script[src="${URL}"]`))
-        return;
-    // ... else attach it.
-    const e = document.createElement('script');
-    const n = document.getElementsByTagName('script')[0];
-    e.type = 'text/javascript';
-    e.async = true;
-    e.src = URL;
-    n.parentNode.insertBefore(e, n);
-};
 export default () => {
     try {
         window.dataLayer = window.dataLayer || [];
         if (!window.gtag) {
-            attachScript();
             /** @type {Gtag.Gtag} */
             window.gtag = function () {
                 // eslint-disable-next-line prefer-rest-params

package/dist/test/utils.test.js

@@ -88,6 +88,15 @@ describe('Utils tests', () => {
         const unformattedSept = 'Sep. 2025';
         const formattedSept = 'Sept. 2025';
         expect(prettifyDate(unformattedSept)).toBe(formattedSept);
+        const unformattedOct = 'Oct. 2025';
+        const formattedOct = 'Oct. 2025';
+        expect(prettifyDate(unformattedOct)).toBe(formattedOct);
+        const unformattedNov = 'Nov 2025';
+        const formattedNov = 'Nov. 2025';
+        expect(prettifyDate(unformattedNov)).toBe(formattedNov);
+        const unformattedDec = 'DEC 2025';
+        const formattedDec = 'Dec. 2025';
+        expect(prettifyDate(unformattedDec)).toBe(formattedDec);
     });
     it('should fix spacing between time and am/pm', () => {
         const unformattedMarch = 'Mar. 1, 2023, 10:00pm';
@@ -102,9 +111,15 @@ describe('Utils tests', () => {
         const unformattedJune = 'Jun. 1, 2023, 10:00AM';
         const formattedJune = 'June 1, 2023, 10:00 a.m.';
         expect(prettifyDate(unformattedJune)).toBe(formattedJune);
+        const unformattedAug = 'aug 1, 2023, 10:00PM';
+        const formattedAug = 'Aug. 1, 2023, 10:00 p.m.';
+        expect(prettifyDate(unformattedAug)).toBe(formattedAug);
         const unformattedSept = 'sep. 1, 2023, 10:00PM';
         const formattedSept = 'Sept. 1, 2023, 10:00 p.m.';
         expect(prettifyDate(unformattedSept)).toBe(formattedSept);
+        const unformattedOct = 'oct 1, 2023, 10:00PM';
+        const formattedOct = 'Oct. 1, 2023, 10:00 p.m.';
+        expect(prettifyDate(unformattedOct)).toBe(formattedOct);
     });
     it('should work with lower or upper case', () => {
         const unformattedMarch = 'MAR. 1, 2023, 10:00pm';
@@ -119,5 +134,8 @@ describe('Utils tests', () => {
         const unformattedJune = 'JUN. 1, 2023, 10:00AM';
         const formattedJune = 'June 1, 2023, 10:00 a.m.';
         expect(prettifyDate(unformattedJune)).toBe(formattedJune);
+        const unformattedAug = 'AUG. 1, 2023, 10:00PM';
+        const formattedAug = 'Aug. 1, 2023, 10:00 p.m.';
+        expect(prettifyDate(unformattedAug)).toBe(formattedAug);
     });
 });

package/dist/utils/index.js

@@ -47,7 +47,11 @@ export const prettifyDate = (input) => {
         apr: 'April',
         jun: 'June',
         jul: 'July',
+        aug: 'Aug.',
         sep: 'Sept.',
+        oct: 'Oct.',
+        nov: 'Nov.',
+        dec: 'Dec.',
     };
     // If the key in conversions is found in the input (case insensitive), replace it with the corresponding value
     const formatted = Object.keys(conversions).reduce((acc, key) => {

package/package.json

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