diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 64d6c336c21..869e6f77552 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -37,7 +37,7 @@ "@guardian/eslint-config-typescript": "12.0.0", "@guardian/identity-auth": "6.0.1", "@guardian/identity-auth-frontend": "8.1.0", - "@guardian/libs": "28.0.0", + "@guardian/libs": "29.0.1", "@guardian/ophan-tracker-js": "2.8.0", "@guardian/react-crossword": "11.1.0", "@guardian/shimport": "1.0.2", diff --git a/dotcom-rendering/src/client/bootCmp.ts b/dotcom-rendering/src/client/bootCmp.ts index 983f0cf1558..1a006280ac7 100644 --- a/dotcom-rendering/src/client/bootCmp.ts +++ b/dotcom-rendering/src/client/bootCmp.ts @@ -34,12 +34,13 @@ const submitConsentToOphan = async (renderingTarget: RenderingTarget) => { }; } if (consentState.aus) { + // Similar to USNAT, we check for both the globalcmpUUID and ccpaUUID cookies for users who may have interacted with the CCPA banner before the migration to AUS. The globalcmpUUID cookie is set when the AUS banner is interacted with, and the ccpaUUID cookie is set when the CCPA banner is interacted with. We need to check both cookies to ensure we have a consentUUID. + const consentUUID = + getCookie({ name: 'globalcmpUUID' }) ?? + getCookie({ name: 'ccpaUUID' }); return { consentJurisdiction: 'AUS', - consentUUID: getCookie({ name: 'ccpaUUID' }) ?? '', - /*consent = - getCookie({ name: 'consentStatus' }) ?? ''; - */ + consentUUID: consentUUID ?? '', consent: consentState.aus.personalisedAdvertising ? 'true' : 'false', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index beec88b08bb..eee4fc5f5d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -297,7 +297,7 @@ importers: version: link:../ab-testing/config '@guardian/braze-components': specifier: 22.2.0 - version: 22.2.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(react@18.3.1) + version: 22.2.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(react@18.3.1) '@guardian/bridget': specifier: 8.7.0 version: 8.7.0 @@ -309,28 +309,28 @@ importers: version: 62.3.5(aws-cdk-lib@2.240.0(constructs@10.5.1))(aws-cdk@2.1107.0)(constructs@10.5.1) '@guardian/commercial-core': specifier: 29.0.0 - version: 29.0.0(@guardian/ab-core@8.0.0(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3)) + version: 29.0.0(@guardian/ab-core@8.0.0(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3)) '@guardian/core-web-vitals': specifier: 7.0.0 - version: 7.0.0(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)(web-vitals@4.2.3) + version: 7.0.0(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)(web-vitals@4.2.3) '@guardian/eslint-config-typescript': specifier: 12.0.0 version: 12.0.0(eslint@8.57.1)(tslib@2.6.2)(typescript@5.5.3) '@guardian/identity-auth': specifier: 6.0.1 - version: 6.0.1(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) + version: 6.0.1(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) '@guardian/identity-auth-frontend': specifier: 8.1.0 - version: 8.1.0(@guardian/identity-auth@6.0.1(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) + version: 8.1.0(@guardian/identity-auth@6.0.1(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) '@guardian/libs': - specifier: 28.0.0 - version: 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + specifier: 29.0.1 + version: 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@guardian/ophan-tracker-js': specifier: 2.8.0 version: 2.8.0 '@guardian/react-crossword': specifier: 11.1.0 - version: 11.1.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3) + version: 11.1.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3) '@guardian/shimport': specifier: 1.0.2 version: 1.0.2 @@ -339,10 +339,10 @@ importers: version: 11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) '@guardian/source-development-kitchen': specifier: 18.1.1 - version: 18.1.1(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) + version: 18.1.1(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) '@guardian/support-dotcom-components': specifier: 8.4.0 - version: 8.4.0(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/ophan-tracker-js@2.8.0)(zod@4.1.12) + version: 8.4.0(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/ophan-tracker-js@2.8.0)(zod@4.1.12) '@guardian/tsconfig': specifier: 0.2.0 version: 0.2.0 @@ -2608,8 +2608,8 @@ packages: typescript: optional: true - '@guardian/libs@28.0.0': - resolution: {integrity: sha512-5348Pu6yr8wRPoBopotuluOOzuRnv4h7ZxTl0At8Rm+aybiOiADsHgxEbS9MMCYh3k/uGyW3uqPTk8LV0Muixg==} + '@guardian/libs@29.0.1': + resolution: {integrity: sha512-OAKAbNzJfS72/wOAjxROGOyJMg+gcs6/mpiqBcppFRZsiqaz8qcdz0V8wCyL8n5HqOcLP31VHUS/SIIBRU2yBQ==} peerDependencies: '@guardian/ophan-tracker-js': ^2.2.10 tslib: ^2.8.1 @@ -12454,10 +12454,10 @@ snapshots: optionalDependencies: typescript: 5.5.3 - '@guardian/braze-components@22.2.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(react@18.3.1)': + '@guardian/braze-components@22.2.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(react@18.3.1)': dependencies: '@emotion/react': 11.14.0(@types/react@18.3.1)(react@18.3.1) - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@guardian/source': 11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) react: 18.3.1 @@ -12486,15 +12486,15 @@ snapshots: transitivePeerDependencies: - aws-crt - '@guardian/commercial-core@29.0.0(@guardian/ab-core@8.0.0(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))': + '@guardian/commercial-core@29.0.0(@guardian/ab-core@8.0.0(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))': dependencies: '@guardian/ab-core': 8.0.0(tslib@2.6.2)(typescript@5.5.3) - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@types/googletag': 3.3.0 - '@guardian/core-web-vitals@7.0.0(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)(web-vitals@4.2.3)': + '@guardian/core-web-vitals@7.0.0(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)(web-vitals@4.2.3)': dependencies: - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) tslib: 2.6.2 web-vitals: 4.2.3 optionalDependencies: @@ -12550,22 +12550,22 @@ snapshots: - eslint-import-resolver-webpack - supports-color - '@guardian/identity-auth-frontend@8.1.0(@guardian/identity-auth@6.0.1(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)': + '@guardian/identity-auth-frontend@8.1.0(@guardian/identity-auth@6.0.1(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)': dependencies: - '@guardian/identity-auth': 6.0.1(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/identity-auth': 6.0.1(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) tslib: 2.6.2 optionalDependencies: typescript: 5.5.3 - '@guardian/identity-auth@6.0.1(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)': + '@guardian/identity-auth@6.0.1(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(tslib@2.6.2)(typescript@5.5.3)': dependencies: - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) tslib: 2.6.2 optionalDependencies: typescript: 5.5.3 - '@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3)': + '@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3)': dependencies: '@guardian/ophan-tracker-js': 2.8.0 tslib: 2.6.2 @@ -12581,10 +12581,10 @@ snapshots: prettier: 3.0.3 tslib: 2.6.2 - '@guardian/react-crossword@11.1.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)': + '@guardian/react-crossword@11.1.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)': dependencies: '@emotion/react': 11.14.0(@types/react@18.3.1)(react@18.3.1) - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@guardian/source': 11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) react: 18.3.1 tslib: 2.6.2 @@ -12599,9 +12599,9 @@ snapshots: dependencies: tslib: 2.6.2 - '@guardian/source-development-kitchen@18.1.1(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3)': + '@guardian/source-development-kitchen@18.1.1(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/source@11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3)': dependencies: - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@guardian/source': 11.3.0(@emotion/react@11.14.0(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.5.3) tslib: 2.6.2 optionalDependencies: @@ -12620,7 +12620,7 @@ snapshots: react: 18.3.1 typescript: 5.5.3 - '@guardian/support-dotcom-components@8.4.0(@guardian/libs@28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/ophan-tracker-js@2.8.0)(zod@4.1.12)': + '@guardian/support-dotcom-components@8.4.0(@guardian/libs@29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3))(@guardian/ophan-tracker-js@2.8.0)(zod@4.1.12)': dependencies: '@aws-sdk/client-cloudwatch': 3.995.0 '@aws-sdk/client-dynamodb': 3.996.0 @@ -12628,7 +12628,7 @@ snapshots: '@aws-sdk/client-ssm': 3.995.0 '@aws-sdk/credential-providers': 3.995.0 '@aws-sdk/lib-dynamodb': 3.996.0(@aws-sdk/client-dynamodb@3.996.0) - '@guardian/libs': 28.0.0(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) + '@guardian/libs': 29.0.1(@guardian/ophan-tracker-js@2.8.0)(tslib@2.6.2)(typescript@5.5.3) '@guardian/ophan-tracker-js': 2.8.0 '@okta/jwt-verifier': 4.0.2 compression: 1.7.4