From 960e109747e6c209b605f8678151f0268416ee4b Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:13:49 +0000 Subject: [PATCH 1/9] Remove US inauguration 2025 link --- common/app/navigation/NavLinks.scala | 2 -- common/test/resources/reference-navigation.json | 6 ------ 2 files changed, 8 deletions(-) diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala index 70de49843f6..ee025a4ea21 100644 --- a/common/app/navigation/NavLinks.scala +++ b/common/app/navigation/NavLinks.scala @@ -270,7 +270,6 @@ object NavLinks { "https://recruiters.theguardian.com/?utm_source=gdnwb&utm_medium=navbar&utm_campaign=Guardian_Navbar_Recruiters&CMP_TU=trdmkt&CMP_BUNIT=jobs", ) val aboutUs = NavLink("About Us", "/about") - val inauguration = NavLink("Trump inauguration", "/us-news/donald-trump-inauguration") // News Pillar val ukNewsPillar = NavLink( @@ -319,7 +318,6 @@ object NavLinks { List( usNews, usPolitics, - inauguration, world, climateCrisis, middleEast, diff --git a/common/test/resources/reference-navigation.json b/common/test/resources/reference-navigation.json index 2ce47235783..10cd6ffddce 100644 --- a/common/test/resources/reference-navigation.json +++ b/common/test/resources/reference-navigation.json @@ -1005,12 +1005,6 @@ "children": [], "classList": [] }, - { - "title": "Trump inauguration", - "url": "/us-news/donald-trump-inauguration", - "children": [], - "classList": [] - }, { "title": "World", "url": "/world", From 3351ec076abe00c2578ecbe8fb62845756661552 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:45:22 +0000 Subject: [PATCH 2/9] Extend shorter-surrogate-cache-for-older-articles switch --- common/app/conf/switches/PerformanceSwitches.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala index ed539a9c066..8b4520845ac 100644 --- a/common/app/conf/switches/PerformanceSwitches.scala +++ b/common/app/conf/switches/PerformanceSwitches.scala @@ -244,7 +244,7 @@ trait PerformanceSwitches { "Shorten the surrogate cache time for older articles for load testing", owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")), safeState = Off, - sellByDate = LocalDate.of(2025, 1, 20), + sellByDate = LocalDate.of(2025, 6, 20), exposeClientSide = false, highImpact = false, ) From 1310f6ffd16fa1087ab76ee6864a9e6b67b13128 Mon Sep 17 00:00:00 2001 From: Rupert Bates Date: Tue, 21 Jan 2025 10:17:52 +0000 Subject: [PATCH 3/9] Increase the size of the user-benefits api AB test to 1% --- common/app/experiments/Experiments.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/app/experiments/Experiments.scala b/common/app/experiments/Experiments.scala index 3cd1316ff50..107cdb1ac34 100644 --- a/common/app/experiments/Experiments.scala +++ b/common/app/experiments/Experiments.scala @@ -56,5 +56,5 @@ object UseUserBenefitsApi description = "Enable the switch from members-data-api to the new user-benefits API", owners = Seq(Owner.withGithub("rupertbates")), sellByDate = LocalDate.of(2025, 6, 30), - participationGroup = Perc0B, + participationGroup = Perc1A, ) From c3b1d805cf816b8cb4562dd0691d2e74b20f8713 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:39:05 +0000 Subject: [PATCH 4/9] Extend shorter-surrogate-cache-for-recent-articles switch --- common/app/conf/switches/PerformanceSwitches.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala index 8b4520845ac..2525479f988 100644 --- a/common/app/conf/switches/PerformanceSwitches.scala +++ b/common/app/conf/switches/PerformanceSwitches.scala @@ -233,7 +233,7 @@ trait PerformanceSwitches { "Shorten the surrogate cache time for recent articles for load testing", owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")), safeState = Off, - sellByDate = LocalDate.of(2025, 1, 20), + sellByDate = LocalDate.of(2025, 12, 1), exposeClientSide = false, highImpact = false, ) @@ -244,7 +244,7 @@ trait PerformanceSwitches { "Shorten the surrogate cache time for older articles for load testing", owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")), safeState = Off, - sellByDate = LocalDate.of(2025, 6, 20), + sellByDate = LocalDate.of(2025, 11, 1), exposeClientSide = false, highImpact = false, ) From 573c838af0bd18b99d0eb8d40ca0e2117f89e1b5 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:57:13 +0000 Subject: [PATCH 5/9] Fix switch tests --- common/app/conf/switches/PerformanceSwitches.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala index 2525479f988..56d2cea8e27 100644 --- a/common/app/conf/switches/PerformanceSwitches.scala +++ b/common/app/conf/switches/PerformanceSwitches.scala @@ -244,7 +244,7 @@ trait PerformanceSwitches { "Shorten the surrogate cache time for older articles for load testing", owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")), safeState = Off, - sellByDate = LocalDate.of(2025, 11, 1), + sellByDate = LocalDate.of(2025, 12, 1), exposeClientSide = false, highImpact = false, ) From 8979260b50b71769624e0a2fbba4c4815d7de696 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:40:00 +0000 Subject: [PATCH 6/9] @guardian/commercial@25.0.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d8afe9ac3c5..e73239f4c18 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "24.1.0", + "@guardian/commercial": "0.0.0-beta-20250117121935", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index be4413c2966..fb12d1c76e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3607,9 +3607,9 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:24.1.0": - version: 24.1.0 - resolution: "@guardian/commercial@npm:24.1.0" +"@guardian/commercial@npm:0.0.0-beta-20250117121935": + version: 0.0.0-beta-20250117121935 + resolution: "@guardian/commercial@npm:0.0.0-beta-20250117121935" dependencies: "@guardian/prebid.js": "npm:8.52.0-10" "@octokit/core": "npm:^6.1.2" @@ -3626,7 +3626,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.2 - checksum: 10c0/03c168eb7e68ebbad41256737f40c353591df659bd988bd8da45f906c9294e7850ce9523db72c48ef1a3167c52d05e3d3b9bf6bd12b6a3c11fe239d02217998b + checksum: 10c0/e7c7d685a7c4567b6f1bda4a0b656cb88e4d1d8404a644c38d2b55b72b555eca46fef9a6e2004b57de2b9ef0a301f460b3020c91b0b81929c2536600146d409c languageName: node linkType: hard @@ -3699,7 +3699,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:24.1.0" + "@guardian/commercial": "npm:0.0.0-beta-20250117121935" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0" From 15ec68f990334936590bd1e8534bbebcfd3be76a Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:45:42 +0000 Subject: [PATCH 7/9] Fix type imports --- .../projects/common/modules/atoms/youtube-player.spec.ts | 2 +- .../javascripts/projects/common/modules/atoms/youtube-player.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/src/javascripts/projects/common/modules/atoms/youtube-player.spec.ts b/static/src/javascripts/projects/common/modules/atoms/youtube-player.spec.ts index 11574888569..213068566aa 100644 --- a/static/src/javascripts/projects/common/modules/atoms/youtube-player.spec.ts +++ b/static/src/javascripts/projects/common/modules/atoms/youtube-player.spec.ts @@ -1,7 +1,7 @@ import type { AdsConfigTCFV2, AdsConfigUSNATorAus, -} from '@guardian/commercial/dist/cjs/core/types'; +} from '@guardian/commercial/dist/core/cjs/lib/types'; import type { ConsentState, OnConsentChangeCallback } from '@guardian/libs'; import { _ as youtubePlayer } from 'common/modules/atoms/youtube-player'; diff --git a/static/src/javascripts/projects/common/modules/atoms/youtube-player.ts b/static/src/javascripts/projects/common/modules/atoms/youtube-player.ts index 058f2bc0169..73a185b2b1d 100644 --- a/static/src/javascripts/projects/common/modules/atoms/youtube-player.ts +++ b/static/src/javascripts/projects/common/modules/atoms/youtube-player.ts @@ -5,7 +5,7 @@ import type { AdsConfigEnabled, AdsConfigTCFV2, AdsConfigUSNATorAus, -} from '@guardian/commercial/dist/cjs/core/types'; +} from '@guardian/commercial/dist/core/cjs/lib/types'; import type { ConsentState } from '@guardian/libs'; import { loadScript, log, onConsentChange } from '@guardian/libs'; import fastdom from 'fastdom'; From 836bd01ce76237f47ea2b0de45572872ac103721 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:47:54 +0000 Subject: [PATCH 8/9] Remove webpack commercial steps --- webpack.config.dev.js | 15 +-------------- webpack.config.prod.js | 10 ---------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/webpack.config.dev.js b/webpack.config.dev.js index 14330e9eb5c..f30f8be08f5 100644 --- a/webpack.config.dev.js +++ b/webpack.config.dev.js @@ -9,18 +9,5 @@ module.exports = webpackMerge.smart(config, { filename: `graun.[name].js`, chunkFilename: `graun.[name].js`, clean: true, - }, - plugins: [ - // Copy the commercial bundle dist to Frontend's static output location: - // static/target/javascripts/commercial - // In development mode the hashed directory structure is discarded and all files are copied to '/commercial' - new CopyPlugin({ - patterns: [ - { - from: "node_modules/@guardian/commercial/dist/bundle/dev", - to: "commercial" - }, - ], - }), - ], + } }); diff --git a/webpack.config.prod.js b/webpack.config.prod.js index c3c4a201dee..c7b2fc0df3e 100644 --- a/webpack.config.prod.js +++ b/webpack.config.prod.js @@ -16,16 +16,6 @@ module.exports = webpackMerge.smart(config, { }, devtool: 'source-map', plugins: [ - // Copy the commercial bundle dist to Frontend's static output location: - // static/target/javascripts/commercial - new CopyPlugin({ - patterns: [ - { - from: 'node_modules/@guardian/commercial/dist/bundle/prod', - to: 'commercial', - }, - ], - }), new webpack.optimize.AggressiveMergingPlugin({ // delicate number: stops enhanced-no-commercial and enhanced // being merged into one From 0dc7037e83359948d161d9f657b42407f1f04d65 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:28:11 +0000 Subject: [PATCH 9/9] @guardian/commercial@25.0.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e73239f4c18..85f4555e7b1 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@emotion/react": "11.11.1", "@emotion/styled": "^10.0.27", "@guardian/ab-core": "8.0.0", - "@guardian/commercial": "0.0.0-beta-20250117121935", + "@guardian/commercial": "25.0.0", "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config-typescript": "9.0.1", "@guardian/identity-auth": "3.0.0", diff --git a/yarn.lock b/yarn.lock index fb12d1c76e8..2036a399dd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3607,9 +3607,9 @@ __metadata: languageName: node linkType: hard -"@guardian/commercial@npm:0.0.0-beta-20250117121935": - version: 0.0.0-beta-20250117121935 - resolution: "@guardian/commercial@npm:0.0.0-beta-20250117121935" +"@guardian/commercial@npm:25.0.0": + version: 25.0.0 + resolution: "@guardian/commercial@npm:25.0.0" dependencies: "@guardian/prebid.js": "npm:8.52.0-10" "@octokit/core": "npm:^6.1.2" @@ -3626,7 +3626,7 @@ __metadata: "@guardian/libs": ^19.1.0 "@guardian/source": ^8.0.0 typescript: ~5.5.2 - checksum: 10c0/e7c7d685a7c4567b6f1bda4a0b656cb88e4d1d8404a644c38d2b55b72b555eca46fef9a6e2004b57de2b9ef0a301f460b3020c91b0b81929c2536600146d409c + checksum: 10c0/990e2fcb6a72a3a5b8236ad2328bf3cbca3c9286ae5f8c0a09938589ccd0c9e929f544458532ce1b4b39441a542c3cfbc7a826f49055ce27ec2277e5b20eb9b5 languageName: node linkType: hard @@ -3699,7 +3699,7 @@ __metadata: "@emotion/react": "npm:11.11.1" "@emotion/styled": "npm:^10.0.27" "@guardian/ab-core": "npm:8.0.0" - "@guardian/commercial": "npm:0.0.0-beta-20250117121935" + "@guardian/commercial": "npm:25.0.0" "@guardian/core-web-vitals": "npm:6.0.0" "@guardian/eslint-config-typescript": "npm:9.0.1" "@guardian/identity-auth": "npm:3.0.0"