Merge 4bab2d4 into 76b1a73

guardian · Nov 19, 2024 · 7b633ee · 7b633ee
2 parents 76b1a73 + 4bab2d4
commit 7b633ee
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 91 deletions.
diff --git a/.changeset/fluffy-games-jog.md b/.changeset/fluffy-games-jog.md
@@ -0,0 +1,5 @@
+---
+'@guardian/commercial': minor
+---
+
+Use region specific bundles for Prebid
diff --git a/package.json b/package.json
@@ -103,10 +103,10 @@
 		"webpack-merge": "^6.0.1"
 	},
 	"dependencies": {
-		"@guardian/prebid.js": "8.52.0-8",
 		"@octokit/core": "^6.1.2",
 		"fastdom": "^1.0.11",
 		"lodash-es": "^4.17.21",
+		"prebid.js": "guardian/prebid.js#4d50ccf7d3f74561ef9d11a091fde5dd434d9810",
 		"process": "^0.11.10",
 		"tslib": "^2.6.2",
 		"web-vitals": "^4.2.1"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/init/consented/prepare-prebid.spec.ts b/src/init/consented/prepare-prebid.spec.ts
@@ -6,13 +6,14 @@ import type {
 import { getConsentFor, log, onConsent } from '@guardian/libs';
 import { commercialFeatures } from '../../lib/commercial-features';
 import { prebid } from '../../lib/header-bidding/prebid/prebid';
-import { isInCanada } from '../../utils/geo-utils';
+import { isInCanada, isInUk } from '../../utils/geo-utils';
 import { _ } from './prepare-prebid';
 
 const { setupPrebid } = _;
 
 jest.mock('utils/geo-utils', () => ({
 	isInCanada: jest.fn(() => false),
+	isInUk: jest.fn(),
 }));
 
 jest.mock('experiments/ab', () => ({
@@ -158,6 +159,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
@@ -173,6 +175,7 @@ describe('init', () => {
 		fakeUserAgent('Google Web Preview');
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).not.toBeCalled();
@@ -188,6 +191,7 @@ describe('init', () => {
 		};
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).not.toBeCalled();
@@ -203,7 +207,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
-		(isInCanada as jest.Mock).mockReturnValueOnce(false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
@@ -235,6 +239,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).not.toBeCalled();
@@ -250,6 +255,7 @@ describe('init', () => {
 		commercialFeatures.adFree = true;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).not.toBeCalled();
@@ -266,6 +272,7 @@ describe('init', () => {
 		window.guardian.config.page.hasPageSkin = true;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).not.toBeCalled();
@@ -280,6 +287,7 @@ describe('init', () => {
 		window.guardian.config.page.hasPageSkin = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
@@ -295,6 +303,8 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
+
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
 	});
@@ -309,6 +319,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithoutConsent);
 		mockGetConsentFor(false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(log).toHaveBeenCalledWith(
@@ -330,6 +341,8 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(usnatWithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
+
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
 	});
@@ -344,6 +357,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(usnatWithoutConsent);
 		mockGetConsentFor(false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(log).toHaveBeenCalledWith(
@@ -365,6 +379,8 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(ausWithConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
+
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
 	});
@@ -379,6 +395,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(ausWithoutConsent);
 		mockGetConsentFor(false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(log).toHaveBeenCalledWith(
@@ -400,6 +417,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(invalidWithoutConsent);
 		mockGetConsentFor(true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(log).toHaveBeenCalledWith(
@@ -421,6 +439,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentForWithCustom(true, false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
@@ -436,6 +455,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentForWithCustom(false, true);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(prebid.initialise).toBeCalled();
@@ -451,6 +471,7 @@ describe('init', () => {
 		commercialFeatures.adFree = false;
 		mockOnConsent(tcfv2WithConsent);
 		mockGetConsentForWithCustom(false, false);
+		(isInUk as jest.Mock).mockReturnValueOnce(true);
 
 		await setupPrebid();
 		expect(log).toHaveBeenCalledWith(