@guardian/commercial-core 4.2.0 → 4.4.0

package/dist/cjs/ad-sizes.d.ts

@@ -25,7 +25,7 @@ declare class AdSize extends Array<number> {
     get height(): number;
 }
 declare type SizeKeys = '160x600' | '300x1050' | '300x250' | '300x600' | '728x90' | '970x250' | 'billboard' | 'empty' | 'fabric' | 'fluid' | 'googleCard' | 'halfPage' | 'inlineMerchandising' | 'leaderboard' | 'merchandising' | 'merchandisingHigh' | 'merchandisingHighAdFeature' | 'mobilesticky' | 'mpu' | 'outOfPage' | 'outstreamDesktop' | 'outstreamGoogleDesktop' | 'outstreamMobile' | 'portrait' | 'skyscraper';
-declare type SlotName = 'right' | 'comments' | 'top-above-nav' | 'mostpop' | 'merchandising' | 'merchandising-high' | 'merchandising-high-lucky' | 'survey' | 'im' | 'inline' | 'mostpop' | 'comments' | 'top-above-nav' | 'carrot' | 'epic' | 'mobile-sticky';
+declare type SlotName = 'right' | 'comments' | 'top-above-nav' | 'mostpop' | 'merchandising' | 'merchandising-high' | 'merchandising-high-lucky' | 'survey' | 'im' | 'inline' | 'mostpop' | 'comments' | 'top-above-nav' | 'carrot' | 'epic' | 'mobile-sticky' | 'crossword-banner';
 declare type Breakpoint = 'mobile' | 'desktop' | 'phablet' | 'tablet';
 declare type SizeMapping = Partial<Record<Breakpoint, AdSize[]>>;
 declare type SlotSizeMappings = Record<SlotName, SizeMapping>;

package/dist/cjs/ad-sizes.js

@@ -243,6 +243,10 @@ const slotSizeMappings = {
     'mobile-sticky': {
         mobile: [adSizes.mobilesticky],
     },
+    'crossword-banner': {
+        tablet: [adSizes.outOfPage, adSizes.empty, adSizes.leaderboard],
+        phablet: [adSizes.outOfPage, adSizes.empty, adSizes.leaderboard],
+    },
 };
 exports.slotSizeMappings = slotSizeMappings;
 const getAdSize = (size) => adSizes[size];

package/dist/cjs/send-commercial-metrics.js

@@ -83,9 +83,9 @@ const listener = (e) => {
 };
 const addVisibilityListeners = () => {
     // Report all available metrics when the page is unloaded or in background.
-    window.addEventListener('visibilitychange', listener);
+    window.addEventListener('visibilitychange', listener, { once: true });
     // Safari does not reliably fire the `visibilitychange` on page unload.
-    window.addEventListener('pagehide', listener);
+    window.addEventListener('pagehide', listener, { once: true });
 };
 const checkConsent = async () => {
     const consentState = await (0, consent_management_platform_1.onConsent)();

package/dist/cjs/targeting/personalised.js

@@ -73,39 +73,27 @@ const getFrequencyValue = (state) => {
     }
     return '0';
 };
-const tcfv2AllPurposesConsented = (consents) => Object.keys(consents).length > 0 && Object.values(consents).every(Boolean);
-const personalisedAdvertising = (state) => {
-    if (state.tcfv2)
-        return tcfv2AllPurposesConsented(state.tcfv2.consents);
-    if (state.ccpa)
-        return !state.ccpa.doNotSell;
-    if (state.aus)
-        return state.aus.personalisedAdvertising;
-    return false;
-};
 const getCMPTargeting = (state) => {
     if (state.tcfv2) {
         return {
             cmp_interaction: state.tcfv2.eventStatus,
-            pa: tcfv2AllPurposesConsented(state.tcfv2.consents) ? 't' : 'f',
-            consent_tcfv2: tcfv2AllPurposesConsented(state.tcfv2.consents)
-                ? 't'
-                : 'f',
+            pa: state.canTarget ? 't' : 'f',
+            consent_tcfv2: state.canTarget ? 't' : 'f',
             rdp: 'na',
         };
     }
     if (state.ccpa) {
         return {
             consent_tcfv2: 'na',
-            rdp: state.ccpa.doNotSell ? 't' : 'f',
-            pa: state.ccpa.doNotSell ? 'f' : 't',
+            rdp: !state.canTarget ? 't' : 'f',
+            pa: state.canTarget ? 't' : 'f',
         };
     }
     if (state.aus) {
         return {
             consent_tcfv2: 'na',
             rdp: 'na',
-            pa: state.aus.personalisedAdvertising ? 't' : 'f',
+            pa: state.canTarget ? 't' : 'f',
         };
     }
     return {
@@ -123,7 +111,11 @@ const createAdManagerGroup = () => {
     return group;
 };
 const getAdManagerGroup = (state) => {
-    if (!personalisedAdvertising(state)) {
+    if (!state.framework) {
+        libs_1.storage.local.remove(AMTGRP_STORAGE_KEY);
+        return null;
+    }
+    if (state.tcfv2 && !state.canTarget) {
         libs_1.storage.local.remove(AMTGRP_STORAGE_KEY);
         return null;
     }
@@ -133,7 +125,7 @@ const getAdManagerGroup = (state) => {
         : createAdManagerGroup();
 };
 const getPermutiveWithState = (state) => {
-    if (personalisedAdvertising(state))
+    if (state.canTarget)
         return (0, permutive_1.getPermutiveSegments)();
     (0, permutive_1.clearPermutiveSegments)();
     return [];

package/dist/esm/ad-sizes.d.ts

@@ -25,7 +25,7 @@ declare class AdSize extends Array<number> {
     get height(): number;
 }
 declare type SizeKeys = '160x600' | '300x1050' | '300x250' | '300x600' | '728x90' | '970x250' | 'billboard' | 'empty' | 'fabric' | 'fluid' | 'googleCard' | 'halfPage' | 'inlineMerchandising' | 'leaderboard' | 'merchandising' | 'merchandisingHigh' | 'merchandisingHighAdFeature' | 'mobilesticky' | 'mpu' | 'outOfPage' | 'outstreamDesktop' | 'outstreamGoogleDesktop' | 'outstreamMobile' | 'portrait' | 'skyscraper';
-declare type SlotName = 'right' | 'comments' | 'top-above-nav' | 'mostpop' | 'merchandising' | 'merchandising-high' | 'merchandising-high-lucky' | 'survey' | 'im' | 'inline' | 'mostpop' | 'comments' | 'top-above-nav' | 'carrot' | 'epic' | 'mobile-sticky';
+declare type SlotName = 'right' | 'comments' | 'top-above-nav' | 'mostpop' | 'merchandising' | 'merchandising-high' | 'merchandising-high-lucky' | 'survey' | 'im' | 'inline' | 'mostpop' | 'comments' | 'top-above-nav' | 'carrot' | 'epic' | 'mobile-sticky' | 'crossword-banner';
 declare type Breakpoint = 'mobile' | 'desktop' | 'phablet' | 'tablet';
 declare type SizeMapping = Partial<Record<Breakpoint, AdSize[]>>;
 declare type SlotSizeMappings = Record<SlotName, SizeMapping>;

package/dist/esm/ad-sizes.js

@@ -238,6 +238,10 @@ const slotSizeMappings = {
     'mobile-sticky': {
         mobile: [adSizes.mobilesticky],
     },
+    'crossword-banner': {
+        tablet: [adSizes.outOfPage, adSizes.empty, adSizes.leaderboard],
+        phablet: [adSizes.outOfPage, adSizes.empty, adSizes.leaderboard],
+    },
 };
 const getAdSize = (size) => adSizes[size];
 // Export for testing

package/dist/esm/send-commercial-metrics.js

@@ -80,9 +80,9 @@ const listener = (e) => {
 };
 const addVisibilityListeners = () => {
     // Report all available metrics when the page is unloaded or in background.
-    window.addEventListener('visibilitychange', listener);
+    window.addEventListener('visibilitychange', listener, { once: true });
     // Safari does not reliably fire the `visibilitychange` on page unload.
-    window.addEventListener('pagehide', listener);
+    window.addEventListener('pagehide', listener, { once: true });
 };
 const checkConsent = async () => {
     const consentState = await onConsent();

package/dist/esm/targeting/personalised.js

@@ -70,39 +70,27 @@ const getFrequencyValue = (state) => {
     }
     return '0';
 };
-const tcfv2AllPurposesConsented = (consents) => Object.keys(consents).length > 0 && Object.values(consents).every(Boolean);
-const personalisedAdvertising = (state) => {
-    if (state.tcfv2)
-        return tcfv2AllPurposesConsented(state.tcfv2.consents);
-    if (state.ccpa)
-        return !state.ccpa.doNotSell;
-    if (state.aus)
-        return state.aus.personalisedAdvertising;
-    return false;
-};
 const getCMPTargeting = (state) => {
     if (state.tcfv2) {
         return {
             cmp_interaction: state.tcfv2.eventStatus,
-            pa: tcfv2AllPurposesConsented(state.tcfv2.consents) ? 't' : 'f',
-            consent_tcfv2: tcfv2AllPurposesConsented(state.tcfv2.consents)
-                ? 't'
-                : 'f',
+            pa: state.canTarget ? 't' : 'f',
+            consent_tcfv2: state.canTarget ? 't' : 'f',
             rdp: 'na',
         };
     }
     if (state.ccpa) {
         return {
             consent_tcfv2: 'na',
-            rdp: state.ccpa.doNotSell ? 't' : 'f',
-            pa: state.ccpa.doNotSell ? 'f' : 't',
+            rdp: !state.canTarget ? 't' : 'f',
+            pa: state.canTarget ? 't' : 'f',
         };
     }
     if (state.aus) {
         return {
             consent_tcfv2: 'na',
             rdp: 'na',
-            pa: state.aus.personalisedAdvertising ? 't' : 'f',
+            pa: state.canTarget ? 't' : 'f',
         };
     }
     return {
@@ -120,7 +108,11 @@ const createAdManagerGroup = () => {
     return group;
 };
 const getAdManagerGroup = (state) => {
-    if (!personalisedAdvertising(state)) {
+    if (!state.framework) {
+        storage.local.remove(AMTGRP_STORAGE_KEY);
+        return null;
+    }
+    if (state.tcfv2 && !state.canTarget) {
         storage.local.remove(AMTGRP_STORAGE_KEY);
         return null;
     }
@@ -130,7 +122,7 @@ const getAdManagerGroup = (state) => {
         : createAdManagerGroup();
 };
 const getPermutiveWithState = (state) => {
-    if (personalisedAdvertising(state))
+    if (state.canTarget)
         return getPermutiveSegments();
     clearPermutiveSegments();
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guardian/commercial-core",
-  "version": "4.2.0",
+  "version": "4.4.0",
   "description": "Guardian advertising business logic",
   "homepage": "https://github.com/guardian/commercial-core#readme",
   "bugs": {
@@ -42,7 +42,7 @@
   },
   "prettier": "@guardian/prettier",
   "devDependencies": {
-    "@commitlint/cli": "^16.1.0",
+    "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.0",
     "@guardian/ab-core": "^2.0.0",
     "@guardian/consent-management-platform": "^10.6.0",
@@ -67,7 +67,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^8.0.1",
     "jest": "^27.4.1",
-    "lint-staged": "^12.1.2",
+    "lint-staged": "^13.0.3",
     "mockdate": "^3.0.5",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.0",