govuk_publishing_components 30.7.1 → 30.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5541caeb04840db83172565a1e2f4f8f572850a113132c5e67d3d46ab00caf1e
-  data.tar.gz: 81d4933ed8632f6bcc89a575a7a208e4575b7a842d0aa844bbfce317a69de9f9
+  metadata.gz: 5a0126e6016869d447d661d4e1c4777d68a10292c19e388bcb22477021877b7b
+  data.tar.gz: e83f7124df4f9126819c1f11310bfda63dde08be6c57749ead9395eef1d58ea0
 SHA512:
-  metadata.gz: 6f8eea00f619818ebbbf6f83a3ffcb63b7d06c62dda8f45aab579f2b13ae363864ff8dbd4cabdcdac331e1fa95174660a9709e845b972aa06c6be8c9f550d439
-  data.tar.gz: da2bb07ca8ab25c753f29af58965afb1dea0cfd781f57e7aea2129fce4a26db90346858341f7d9ba7adb572b5f7867db3a45586d487b56b5b98e151d9932d21b
+  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,14 +8,45 @@ window.GOVUK.analyticsGA4 = window.GOVUK.analyticsGA4 || {};
 
   var core = {
     load: function () {
-      /* eslint-disable */
-      (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+ '&gtm_auth=' + window.GOVUK.analyticsGA4.vars.auth + '&gtm_preview=' + window.GOVUK.analyticsGA4.vars.preview + '&gtm_cookies_win=x';f.parentNode.insertBefore(j,f);
-      })(window,document,'script','dataLayer',window.GOVUK.analyticsGA4.vars.id);
-      window.dataLayer.push({ 'gtm.blocklist' : ['customPixels', 'customScripts', 'html', 'nonGoogleScripts'] })
-      /* eslint-enable */
+      var firstScript
+      var newScript
+
+      if (window.GOVUK.analyticsGA4.vars.gtag_id) {
+        // initialise gtag
+        window.dataLayer = window.dataLayer || []
+        var gtag = function () { window.dataLayer.push(arguments) }
+        gtag('js', new Date())
+        gtag('config', window.GOVUK.analyticsGA4.vars.gtag_id)
+
+        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
+        firstScript.parentNode.insertBefore(newScript, firstScript)
+      } else {
+        // initialise GTM
+        window.dataLayer = window.dataLayer || []
+        window.dataLayer.push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' })
+
+        firstScript = document.getElementsByTagName('script')[0]
+        newScript = document.createElement('script')
+
+        var auth = window.GOVUK.analyticsGA4.vars.auth || ''
+        var preview = window.GOVUK.analyticsGA4.vars.preview || ''
+        if (auth) {
+          auth = '&gtm_auth=' + auth
+        }
+        if (preview) {
+          preview = '&gtm_preview=' + preview + '&gtm_cookies_win=x'
+        }
+
+        newScript.async = true
+        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'] })
+      }
     },
 
     sendData: function (data) {

data/lib/govuk_publishing_components/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 30.7.1
+  version: 30.7.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config