Merge branch 'main' into gl/flex-gen-visible-stories

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("[email protected]")),
     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("[email protected]")),
     safeState = Off,
-    sellByDate = LocalDate.of(2025, 1, 20),
+    sellByDate = LocalDate.of(2025, 12, 1),
     exposeClientSide = false,
     highImpact = false,
   )

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,
     )

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,

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",

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": "25.0.0",
 		"@guardian/core-web-vitals": "6.0.0",
 		"@guardian/eslint-config-typescript": "9.0.1",
 		"@guardian/identity-auth": "3.0.0",

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';
 

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';

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"
-              },
-            ],
-        }),
-    ],
+    }
 });

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

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: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/03c168eb7e68ebbad41256737f40c353591df659bd988bd8da45f906c9294e7850ce9523db72c48ef1a3167c52d05e3d3b9bf6bd12b6a3c11fe239d02217998b
+  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:24.1.0"
+    "@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"