govuk_publishing_components 30.7.2 → 30.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7f16760ab4f91b2f86e6dda6f9066d33f3e1dc305170a0a7aca313df2fbf63
-  data.tar.gz: 7484fc85aad02f15bdb4de512979855520517a7cff39b6f8c7365be85666f176
+  metadata.gz: 5a0126e6016869d447d661d4e1c4777d68a10292c19e388bcb22477021877b7b
+  data.tar.gz: e83f7124df4f9126819c1f11310bfda63dde08be6c57749ead9395eef1d58ea0
 SHA512:
-  metadata.gz: 19878d148ec4971e70494e929eb372e1c83411ca86e14435afba05929feb01d793c3300152150f11fe94370ae98997b30c2759a1b5c84dff4e81d7013446631a
-  data.tar.gz: 9e29ae1795f429a733a63da7da96382318a9a590e767086222e47802c075a0a6b510d511e57205a95d63a0528e03b6458d9e4266ca092e617134b71d8db58387
+  metadata.gz: 03ac390a2a2a9fa5378699daac0dab1a55551bee3ab995f159487c5a5d295a3ff139629fab6b9f0b95dc52bc4d89d5b941f867e00c20fe9562eafbb5d5af43ef
+  data.tar.gz: ee961b5da8eacf0d47567ae446a1c1741ea65576affbdeb84916bb48a64064de8383c1ad64de86da84def9ad5f13c034c7893dca904a7a64e8405b0133754e37

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-core.js.erb

@@ -1,3 +1,5 @@
+// note that because this file is .js.erb it is not linted
+// temporarily rename to .js to check with the linter
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.analyticsGA4 = window.GOVUK.analyticsGA4 || {};
 
@@ -6,28 +8,29 @@ window.GOVUK.analyticsGA4 = window.GOVUK.analyticsGA4 || {};
 
   var core = {
     load: function () {
+      var firstScript
+      var newScript
+
       if (window.GOVUK.analyticsGA4.vars.gtag_id) {
         // initialise gtag
         window.dataLayer = window.dataLayer || []
-        function gtag() { dataLayer.push(arguments) }
+        var gtag = function () { window.dataLayer.push(arguments) }
         gtag('js', new Date())
         gtag('config', window.GOVUK.analyticsGA4.vars.gtag_id)
 
-        var firstScript = document.getElementsByTagName('script')[0]
-        var newScript = document.createElement('script')
-        var dl = 'dataLayer' != 'dataLayer' ? '&l=' + 'dataLayer' : ''
+        firstScript = document.getElementsByTagName('script')[0]
+        newScript = document.createElement('script')
 
         newScript.async = true
-        newScript.src = '//www.googletagmanager.com/gtag/js?id=' + window.GOVUK.analyticsGA4.vars.gtag_id + dl
+        newScript.src = '//www.googletagmanager.com/gtag/js?id=' + window.GOVUK.analyticsGA4.vars.gtag_id
         firstScript.parentNode.insertBefore(newScript, firstScript)
       } else {
         // initialise GTM
         window.dataLayer = window.dataLayer || []
         window.dataLayer.push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' })
 
-        var firstScript = document.getElementsByTagName('script')[0]
-        var newScript = document.createElement('script')
-        var dl = 'dataLayer' != 'dataLayer' ? '&l=' + 'dataLayer' : ''
+        firstScript = document.getElementsByTagName('script')[0]
+        newScript = document.createElement('script')
 
         var auth = window.GOVUK.analyticsGA4.vars.auth || ''
         var preview = window.GOVUK.analyticsGA4.vars.preview || ''
@@ -39,10 +42,10 @@ window.GOVUK.analyticsGA4 = window.GOVUK.analyticsGA4 || {};
         }
 
         newScript.async = true
-        this.googleSrc = 'https://www.googletagmanager.com/gtm.js?id=' + window.GOVUK.analyticsGA4.vars.id + dl + auth + preview
+        this.googleSrc = 'https://www.googletagmanager.com/gtm.js?id=' + window.GOVUK.analyticsGA4.vars.id + auth + preview
         newScript.src = this.googleSrc
         firstScript.parentNode.insertBefore(newScript, firstScript)
-        window.dataLayer.push({ 'gtm.blocklist' : ['customPixels', 'customScripts', 'html', 'nonGoogleScripts'] })
+        window.dataLayer.push({ 'gtm.blocklist': ['customPixels', 'customScripts', 'html', 'nonGoogleScripts'] })
       }
     },
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "30.7.2".freeze
+  VERSION = "30.7.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 30.7.2
+  version: 30.7.3
 platform: ruby
 authors:
 - GOV.UK Dev