@govuk-one-login/frontend-ui 1.4.3 → 2.0.0

package/build/components/bases/identity/identity-base-form.njk

@@ -1,10 +1,14 @@
 {% if MAY_2025_REBRAND_ENABLED %}
-{% set govukRebrand = true %}
-{% set assetPath = "/public/rebrand"%}
+  {% set govukRebrand = true %}
+  {% set assetPath = "/public/rebrand"%}
 {% endif %}
 
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+
 {% extends "form-template.njk" %}
 
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
 {% from "frontend-ui/build/components/phase-banner/macro.njk" import frontendUiPhaseBanner %}
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
@@ -16,12 +20,12 @@
 {% endblock %}
 
 {%- block pageTitle %}
-    {{- (translate("govuk.error", { default: "Error" }) + ": ") if errorlist.length }}{{ hmpoTitle | safe }}{{ " – " + govukServiceName | safe if govukServiceName !== " " }} – GOV.UK One Login
+  {{- (translate("govuk.error", { default: "Error" }) + ": ") if errorlist.length }}{{ hmpoTitle | safe }}{{ " – " + govukServiceName | safe if govukServiceName !== " " }} – GOV.UK One Login
 {%- endblock %}
 
 {% block header %}
   {% block cookieBanner %}
-      {{ frontendUiCookieBanner({
+    {{ frontendUiCookieBanner({
     translations: translations.cookieBanner
   }
   )}}
@@ -36,7 +40,7 @@
 {% endblock %}
 
 {% block beforeContent %}
-    {{ frontendUiPhaseBanner({
+  {{ frontendUiPhaseBanner({
       translations: translations.phaseBanner,
       url: currentUrl,
       contactUrl: 'https://signin.account.gov.uk/contact-us'
@@ -47,18 +51,17 @@
       url: currentUrl,
       activeLanguage: htmlLang
     }) }}
-      {% if backLink %}
-        {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-        <span id="back">{{ govukBackLink({
+    {% if backLink %}
+      {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+      <span id="back">{{ govukBackLink({
           text: translate("govuk.backLink"),
           href: backLink}) }}
-        </span>
-      {% endif %}
+      </span>
+    {% endif %}
 
   {% endblock %}
 {% endblock %}
 
-
 {% block footer %}
   {{ frontendUiFooter({
     translations: translations.footer
@@ -70,31 +73,49 @@
     <script type="text/javascript" src="/public/javascripts/all.js"></script>
     <script type="text/javascript" src="/public/javascripts/analytics.js"></script>
     <script type="text/javascript" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      window.GOVUKFrontend.initAll()
-      window.DI.appInit({
-        ga4ContainerId: "{{ga4ContainerId}}",
-        uaContainerId:"{{uaContainerId}}"},{
-          enableGa4Tracking:{{ga4Enabled}},
-          enableUaTracking:{{uaEnabled}},
-          enablePageViewTracking:{{ga4PageViewEnabled}},
-          enableFormErrorTracking:{{ga4FormErrorEnabled}},
-          enableFormChangeTracking:{{ga4FormChangeEnabled}},
-          enableFormResponseTracking:{{ga4FormResponseEnabled}},
-          enableNavigationTracking:{{ga4NavigationEnabled}},
-          enableSelectContentTracking:{{ga4SelectContentEnabled}},
-          cookieDomain:"{{analyticsCookieDomain}}",
-          isDataSensitive:{{analyticsDataSensitive}}
-        }
-      );
+      window
+        .GOVUKFrontend
+        .initAll()
+      window
+        .DI
+        .appInit({
+          ga4ContainerId: "{{ga4ContainerId}}",
+          uaContainerId: "{{uaContainerId}}"
+        }, {
+          enableGa4Tracking: {{ga4Enabled}},
+          enableUaTracking: {{uaEnabled}},
+          enablePageViewTracking: {{ga4PageViewEnabled}},
+          enableFormErrorTracking: {{ga4FormErrorEnabled}},
+          enableFormChangeTracking: {{ga4FormChangeEnabled}},
+          enableFormResponseTracking: {{ga4FormResponseEnabled}},
+          enableNavigationTracking: {{ga4NavigationEnabled}},
+          enableSelectContentTracking: {{ga4SelectContentEnabled}},
+          cookieDomain: "{{analyticsCookieDomain}}",
+          isDataSensitive: {{analyticsDataSensitive}},
+          isPageDataSensitive: {{isPageDataSensitive}}
+        });
     </script>
 
     {% if deviceIntelligenceEnabled %}
-    <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
-    <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      import { setFingerprintCookie } from "/public/javascripts/deviceIntelligence.js";
-      setFingerprintCookie("{{deviceIntelligenceDomain}}")
-    </script>
+      <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
+      <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
+        import {setFingerprintCookie} from "/public/javascripts/deviceIntelligence.js";
+        setFingerprintCookie("{{deviceIntelligenceDomain}}")
+      </script>
     {% endif %}
 
+    {{ ga4OnPageLoad({
+        nonce: cspNonce,
+        statusCode: statusCode,
+        dynamic: isPageDynamic,
+        englishPageTitle: pageTitleKey | translate,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID,
+        loggedInStatus: loggedInStatus
+    }) }}
   {% endblock %}
-{% endblock %}
+{% endblock %}

package/build/components/bases/identity/identity-base-page.njk

@@ -1,10 +1,14 @@
 {% if MAY_2025_REBRAND_ENABLED %}
-{% set govukRebrand = true %}
-{% set assetPath = "/public/rebrand"%}
+  {% set govukRebrand = true %}
+  {% set assetPath = "/public/rebrand"%}
 {% endif %}
 
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+
 {% extends "hmpo-template.njk" %}
 
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
 {% from "frontend-ui/build/components/phase-banner/macro.njk" import frontendUiPhaseBanner %}
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
@@ -21,7 +25,7 @@
 
 {% block header %}
   {% block cookieBanner %}
-      {{ frontendUiCookieBanner({
+    {{ frontendUiCookieBanner({
     translations: translations.cookieBanner
   }
   )}}
@@ -36,7 +40,7 @@
 {% endblock %}
 
 {% block beforeContent %}
-    {{ frontendUiPhaseBanner({
+  {{ frontendUiPhaseBanner({
       translations: translations.phaseBanner,
       url: currentUrl,
       contactUrl: 'https://signin.account.gov.uk/contact-us'
@@ -47,13 +51,13 @@
       url: currentUrl,
       activeLanguage: htmlLang
     }) }}
-      {% if backLink %}
-        {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-        <span id="back">{{ govukBackLink({
+    {% if backLink %}
+      {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+      <span id="back">{{ govukBackLink({
           text: translate("govuk.backLink"),
           href: backLink}) }}
-        </span>
-      {% endif %}
+      </span>
+    {% endif %}
 
   {% endblock %}
 {% endblock %}
@@ -69,31 +73,49 @@
     <script type="text/javascript" src="/public/javascripts/all.js"></script>
     <script type="text/javascript" src="/public/javascripts/analytics.js"></script>
     <script type="text/javascript" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      window.GOVUKFrontend.initAll()
-      window.DI.appInit({
-        ga4ContainerId: "{{ga4ContainerId}}",
-        uaContainerId:"{{uaContainerId}}"
-      },{
-        enableGa4Tracking:{{ga4Enabled}},
-        enableUaTracking:{{uaEnabled}},
-        enablePageViewTracking:{{ga4PageViewEnabled}},
-        enableFormErrorTracking:{{ga4FormErrorEnabled}},
-        enableFormChangeTracking:{{ga4FormChangeEnabled}},
-        enableFormResponseTracking:{{ga4FormResponseEnabled}},
-        enableNavigationTracking:{{ga4NavigationEnabled}},
-        enableSelectContentTracking:{{ga4SelectContentEnabled}},
-        cookieDomain:"{{analyticsCookieDomain}}",
-        isDataSensitive:{{analyticsDataSensitive}}
-      });
+      window
+        .GOVUKFrontend
+        .initAll()
+      window
+        .DI
+        .appInit({
+          ga4ContainerId: "{{ga4ContainerId}}",
+          uaContainerId: "{{uaContainerId}}"
+        }, {
+          enableGa4Tracking: {{ga4Enabled}},
+          enableUaTracking: {{uaEnabled}},
+          enablePageViewTracking: {{ga4PageViewEnabled}},
+          enableFormErrorTracking: {{ga4FormErrorEnabled}},
+          enableFormChangeTracking: {{ga4FormChangeEnabled}},
+          enableFormResponseTracking: {{ga4FormResponseEnabled}},
+          enableNavigationTracking: {{ga4NavigationEnabled}},
+          enableSelectContentTracking: {{ga4SelectContentEnabled}},
+          cookieDomain: "{{analyticsCookieDomain}}",
+          isDataSensitive: {{analyticsDataSensitive}},
+          isPageDataSensitive: {{isPageDataSensitive}}
+        });
     </script>
 
     {% if deviceIntelligenceEnabled %}
-    <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
-    <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      import { setFingerprintCookie } from "/public/javascripts/deviceIntelligence.js";
-      setFingerprintCookie("{{deviceIntelligenceDomain}}")
-    </script>
-  {% endif %}
+      <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
+      <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
+        import {setFingerprintCookie} from "/public/javascripts/deviceIntelligence.js";
+        setFingerprintCookie("{{deviceIntelligenceDomain}}")
+      </script>
+    {% endif %}
 
+    {{ ga4OnPageLoad({
+        nonce: cspNonce,
+        statusCode: statusCode,
+        dynamic: isPageDynamic,
+        englishPageTitle: pageTitleKey | translate,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID,
+        loggedInStatus: loggedInStatus
+    }) }}
   {% endblock %}
-{% endblock %}
+{% endblock %}

package/build/components/bases/ipv-core/ipv-core-base.njk

@@ -2,7 +2,10 @@
     {% set govukRebrand = true %}
 {% endif %}
 
-{% set isPageDataSensitive = false %}
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+{% set taxLevel2 = 'pre cri' %}
+
 
 {% extends "govuk/template.njk" %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
@@ -10,9 +13,7 @@
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
 {% from "frontend-ui/build/components/footer/macro.njk" import frontendUiFooter %}
 {% from "frontend-ui/build/components/language-select/macro.njk" import frontendUiLanguageSelect %}
-{# {% from "frontend-analytics/components/ga4-opl/macro.njk" import frontendAnalyticsGa4OnPageLoad %} #}
-
-{% from  basePath ~ "/views/shared/ga4/on-page-load-macro.njk" import ga4OnPageLoad %}
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
@@ -146,18 +147,24 @@
                     ga4ContainerId: "{{ ga4ContainerId }}",
                     uaContainerId: "{{ uaContainerId }}"
                 }, {
+                    isDataSensitive: {{analyticsDataSensitive}},
+                    isPageDataSensitive: {{isPageDataSensitive}},
                     enableGa4Tracking: {{isGa4Enabled}},
                     enableUaTracking: {{isUaEnabled}},
                     cookieDomain: "{{analyticsCookieDomain}}"
                 });
         </script>
         {{ ga4OnPageLoad({
-        cspNonce: cspNonce,
-        isPageDynamic: isPageDynamic,
-         englishPageTitle: pageTitleKey | translateToEnglish }) }}
-        {# {{ frontendAnalyticsGa4OnPageLoad({
         nonce: cspNonce,
+        statusCode: statusCode,         
         dynamic: isPageDynamic,
-        englishPageTitle: pageTitleKey | translateToEnglish }) }} #}
+        englishPageTitle: pageTitleKey | translateToEnglish,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID
+    }) }}
 
     {% endblock %}

package/build/esm/frontend/index.d.ts

@@ -1,2 +1,2 @@
-export { WaitInteractions } from "./typescript/spinner";
+export { useSpinner } from "./spinner/spinner";
 //# sourceMappingURL=index.d.ts.map

package/build/esm/frontend/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../frontend-src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../frontend-src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC"}