Prepare code to remove GA from Web and AMP (#1393)

* Prepare code to remove ga from theguardian.com * Remove googleAnalytics from GuardianWindowConfig * Remove google.analytics dependency and all ga reference * Update PeformanceEntry to use entryType === 'navigation' * Add changeset with minor change * Update .changeset/strange-pugs-wink.md Co-authored-by: Simon Adcock <[email protected]> * Update strange-pugs-wink.md --------- Co-authored-by: Ravi <[email protected]> Co-authored-by: Simon Adcock <[email protected]>
guardian · Jun 7, 2024 · a90f1d4 · a90f1d4
1 parent 03d7e81
commit a90f1d4
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 253 deletions.
diff --git a/.changeset/strange-pugs-wink.md b/.changeset/strange-pugs-wink.md
@@ -0,0 +1,5 @@
+---
+'@guardian/commercial': minor
+---
+
+Prepare code to remove GA from Commercial
diff --git a/package.json b/package.json
@@ -60,7 +60,6 @@
 		"@guardian/prettier": "4.0.0",
 		"@guardian/source-foundations": "14.1.4",
 		"@playwright/test": "1.40.1",
-		"@types/google.analytics": "^0.0.42",
 		"@types/googletag": "~3.1.3",
 		"@types/jest": "^29.4.0",
 		"@types/lodash-es": "^4.17.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/core/event-timer.spec.ts b/src/core/event-timer.spec.ts
@@ -81,11 +81,6 @@ describe('EventTimer', () => {
 		window.guardian = {
 			config: {
 				...DEFAULT_CONFIG,
-				googleAnalytics: {
-					trackers: {
-						editorial: 'gaTrackerTest',
-					},
-				},
 			},
 		} as typeof window.guardian;
 

diff --git a/src/core/messenger/click.spec.ts b/src/core/messenger/click.spec.ts
diff --git a/src/core/messenger/click.ts b/src/core/messenger/click.ts
diff --git a/src/core/targeting/build-page-targeting.spec.ts b/src/core/targeting/build-page-targeting.spec.ts
@@ -986,11 +986,11 @@ describe('Build Page Targeting', () => {
 		).toBe('t');
 	});
 
-	it('should set firstvisit to true if referrer is empty and navigation type is navigate', () => {
+	it('should set firstvisit to true if referrer is empty and navigation type is navigation', () => {
 		jest.spyOn(window, 'performance', 'get').mockReturnValue({
 			getEntriesByType: () => [
 				{
-					type: 'navigate',
+					entryType: 'navigation',
 				},
 			],
 			mark: () => {
@@ -1011,11 +1011,11 @@ describe('Build Page Targeting', () => {
 		).toBe('t');
 	});
 
-	it('should set firstvisit to false if referrer is empty and navigation type is not navigate', () => {
+	it('should set firstvisit to false if referrer is empty and navigation type is not navigation', () => {
 		jest.spyOn(window, 'performance', 'get').mockReturnValue({
 			getEntriesByType: () => [
 				{
-					type: 'reload',
+					entryType: 'reload',
 				},
 			],
 			mark: () => {
@@ -1036,11 +1036,11 @@ describe('Build Page Targeting', () => {
 		).toBe('f');
 	});
 
-	it('should set firstvisit to false if referrer is the guardian and navigation type is navigate', () => {
+	it('should set firstvisit to false if referrer is the guardian and navigation type is navigation', () => {
 		jest.spyOn(window, 'performance', 'get').mockReturnValue({
 			getEntriesByType: () => [
 				{
-					type: 'navigate',
+					entryType: 'navigation',
 				},
 			],
 			mark: () => {
@@ -1063,11 +1063,11 @@ describe('Build Page Targeting', () => {
 		).toBe('f');
 	});
 
-	it('should set firstvisit to false if referrer is the guardian and navigation type is not navigate', () => {
+	it('should set firstvisit to false if referrer is the guardian and navigation type is not navigation', () => {
 		jest.spyOn(window, 'performance', 'get').mockReturnValue({
 			getEntriesByType: () => [
 				{
-					type: 'reload',
+					entryType: 'reload',
 				},
 			],
 			mark: () => {
@@ -1090,11 +1090,11 @@ describe('Build Page Targeting', () => {
 		).toBe('f');
 	});
 
-	it('should set firstvisit to true if referrer is not the guardian and navigation type is navigate', () => {
+	it('should set firstvisit to true if referrer is not the guardian and navigation type is navigation', () => {
 		jest.spyOn(window, 'performance', 'get').mockReturnValue({
 			getEntriesByType: () => [
 				{
-					type: 'navigate',
+					entryType: 'navigation',
 				},
 			],
 			mark: () => {

diff --git a/src/core/targeting/build-page-targeting.ts b/src/core/targeting/build-page-targeting.ts
@@ -69,13 +69,14 @@ const filterValues = (pageTargets: Record<string, unknown>) => {
 	return filtered;
 };
 
-const getLastNavigationType = (): NavigationTimingType | undefined => {
+const lastPerformanceEntryIsNavigationType = (): boolean => {
 	if (!supportsPerformanceAPI()) {
-		return undefined;
+		return false;
 	}
 	const navigationEvents = performance.getEntriesByType('navigation');
 	const lastNavigationEvent = navigationEvents[navigationEvents.length - 1];
-	return lastNavigationEvent?.type;
+	// https://developer.mozilla.org/en-US/docs/Web/API/PerformanceEntry/entryType#navigation
+	return lastNavigationEvent?.entryType === 'navigation';
 };
 
 const referrerMatchesHost = (referrer: string): boolean => {
@@ -88,7 +89,7 @@ const referrerMatchesHost = (referrer: string): boolean => {
 
 // A consentless friendly way of determining if this is the users first visit to the page
 const isFirstVisit = (referrer: string): boolean => {
-	if (supportsPerformanceAPI() && getLastNavigationType() !== 'navigate') {
+	if (supportsPerformanceAPI() && !lastPerformanceEntryIsNavigationType()) {
 		return false;
 	}
 

diff --git a/src/core/types.ts b/src/core/types.ts
@@ -36,14 +36,9 @@ export type ThirdPartyTag = {
 
 export type GetThirdPartyTag = (arg0: { shouldRun: boolean }) => ThirdPartyTag;
 
-export type GuardianAnalyticsConfig = {
-	trackers: Record<string, string>;
-};
-
 export type Edition = 'UK' | 'AU' | 'US';
 
 export type GuardianWindowConfig = {
-	googleAnalytics?: GuardianAnalyticsConfig;
 	isDotcomRendering: boolean;
 	ophan: {
 		// somewhat redundant with guardian.ophan

diff --git a/src/init/consented/messenger.ts b/src/init/consented/messenger.ts
@@ -1,6 +1,5 @@
 import { initMessenger } from 'core';
 import { init as background } from 'core/messenger/background';
-import { init as sendClick } from 'core/messenger/click';
 import { init as disableRefresh } from 'core/messenger/disable-refresh';
 import { init as fullwidth } from 'core/messenger/full-width';
 import { init as initGetPageTargeting } from 'core/messenger/get-page-targeting';
@@ -28,7 +27,6 @@ initMessenger(
 		passbackRefresh,
 		resize,
 		fullwidth,
-		sendClick,
 		background,
 		disableRefresh,
 		passback,

diff --git a/src/init/consented/prepare-googletag.spec.ts b/src/init/consented/prepare-googletag.spec.ts
@@ -71,7 +71,6 @@ jest.mock('lib/detect/detect-breakpoint', () => ({
 	getCurrentBreakpoint: jest.fn(),
 	hasCrossedBreakpoint: jest.fn(),
 }));
-jest.mock('lib/analytics/google', () => () => void {});
 jest.mock('display/display-lazy-ads', () => ({
 	displayLazyAds: jest.fn(),
 }));

diff --git a/src/lib/analytics/google.ts b/src/lib/analytics/google.ts