Merge branch 'main' into doml/subtitles

Author: abeddow91

.github/workflows/ab-testing-checks.yml

@@ -20,6 +20,7 @@ on:
 jobs:
   checks:
     runs-on: ubuntu-latest
+    name: Checks
     defaults:
       run:
         working-directory: ab-testing

.github/workflows/ab-testing-deploy-code.yml renamed to .github/workflows/ab-testing-ci-code.yml

@@ -1,4 +1,4 @@
-name: 🧪 Deploy CODE AB Testing Config
+name: 🧪 AB testing CI (CODE)
 
 permissions:
   contents: read

.github/workflows/ab-testing-ci.yml

@@ -7,10 +7,31 @@ on:
   pull_request:
     paths:
       - 'ab-testing/**'
+      - '.github/workflows/ab-testing-*.yml'
+  push:
+    branches:
+      - main
+    paths:
+      - 'ab-testing/**'
+      - '.github/workflows/ab-testing-*.yml'
 
 jobs:
-  checks:
+  ci:
+    name: CI
     uses: ./.github/workflows/ab-testing-checks.yml
+    with:
+      save_build_artifact: true
+    secrets:
+      FASTLY_AB_TESTING_CONFIG: ${{ secrets.FASTLY_PROD_AB_TESTING_CONFIG }}
+      FASTLY_API_TOKEN: ${{ secrets.FASTLY_PROD_API_TOKEN }}
+
+  deploy:
+    name: Deploy
+    needs: ci
+    if: github.ref == 'refs/heads/main'
+    uses: ./.github/workflows/ab-testing-deploy.yml
+    with:
+      stage: prod
     secrets:
-      FASTLY_AB_TESTING_CONFIG: ${{ secrets.FASTLY_CODE_AB_TESTING_CONFIG }}
-      FASTLY_API_TOKEN: ${{ secrets.FASTLY_CODE_API_TOKEN }}
+      FASTLY_AB_TESTING_CONFIG: ${{ secrets.FASTLY_PROD_AB_TESTING_CONFIG }}
+      FASTLY_API_TOKEN: ${{ secrets.FASTLY_PROD_API_TOKEN }}

.github/workflows/ab-testing-deploy-prod.yml

@@ -3,11 +3,13 @@ on:
   pull_request:
     paths:
       - 'ab-testing/**'
+      - '.github/workflows/ab-testing-*.yml'
   push:
     branches:
       - main
     paths:
       - 'ab-testing/**'
+      - '.github/workflows/ab-testing-*.yml'
 
 jobs:
   build-ui:

.github/workflows/ab-testing-ui.yml

@@ -34,16 +34,16 @@
 	"dependencies": {
 		"@aws-sdk/client-ssm": "3.621.0",
 		"@aws-sdk/credential-providers": "3.621.0",
-		"@babel/core": "7.28.0",
-		"@babel/preset-env": "7.28.0",
+		"@babel/core": "7.28.4",
+		"@babel/preset-env": "7.28.3",
 		"@creditkarma/thrift-server-core": "1.0.4",
 		"@emotion/cache": "11.14.0",
 		"@emotion/jest": "11.13.0",
 		"@emotion/react": "11.14.0",
 		"@emotion/server": "11.11.0",
 		"@guardian/apps-rendering-api-models": "13.0.1",
 		"@guardian/bridget": "7.0.0",
-		"@guardian/cdk": "62.0.0",
+		"@guardian/cdk": "62.0.1",
 		"@guardian/content-api-models": "31.0.0",
 		"@guardian/content-atom-model": "6.1.0",
 		"@guardian/eslint-config-typescript": "11.0.0",
@@ -85,7 +85,7 @@
 		"eslint-plugin-jsx-a11y": "6.7.1",
 		"eslint-plugin-react": "7.33.2",
 		"express": "5.1.0",
-		"html-webpack-plugin": "5.6.3",
+		"html-webpack-plugin": "5.6.4",
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",
 		"jsdom": "16.7.0",
@@ -98,13 +98,13 @@
 		"storybook": "8.6.14",
 		"thrift": "0.20.0",
 		"ts-jest": "29.1.2",
-		"ts-loader": "9.5.2",
+		"ts-loader": "9.5.4",
 		"tslib": "2.6.2",
 		"tsx": "4.6.2",
 		"typescript": "5.5.3",
-		"webpack": "5.101.0",
+		"webpack": "5.102.1",
 		"webpack-cli": "6.0.1",
-		"webpack-dev-server": "5.2.1",
+		"webpack-dev-server": "5.2.2",
 		"webpack-manifest-plugin": "5.0.0",
 		"whatwg-fetch": "3.6.19",
 		"winston": "3.11.0",

apps-rendering/package.json

@@ -31,7 +31,7 @@
 		"@guardian/braze-components": "22.2.0",
 		"@guardian/bridget": "8.7.0",
 		"@guardian/browserslist-config": "6.1.0",
-		"@guardian/cdk": "62.0.0",
+		"@guardian/cdk": "62.0.1",
 		"@guardian/commercial-core": "28.0.0",
 		"@guardian/core-web-vitals": "7.0.0",
 		"@guardian/eslint-config-typescript": "11.0.0",
@@ -46,7 +46,7 @@
 		"@guardian/support-dotcom-components": "7.10.1",
 		"@guardian/tsconfig": "0.2.0",
 		"@playwright/test": "1.52.0",
-		"@sentry/browser": "10.19.0",
+		"@sentry/browser": "10.20.0",
 		"@storybook/addon-essentials": "8.6.14",
 		"@storybook/addon-interactions": "8.6.14",
 		"@storybook/addon-webpack5-compiler-swc": "3.0.0",
@@ -160,7 +160,7 @@
 		"swr": "1.3.0",
 		"to-string-loader": "1.2.0",
 		"trusted-types": "2.0.0",
-		"ts-loader": "9.5.2",
+		"ts-loader": "9.5.4",
 		"ts-unused-exports": "10.1.0",
 		"tslib": "2.6.2",
 		"tsx": "4.6.2",
@@ -170,19 +170,19 @@
 		"unified": "11.0.5",
 		"valibot": "0.28.1",
 		"web-vitals": "4.2.3",
-		"webpack": "5.101.0",
-		"webpack-assets-manifest": "6.0.2",
+		"webpack": "5.102.1",
+		"webpack-assets-manifest": "6.3.0",
 		"webpack-bundle-analyzer": "4.10.2",
 		"webpack-cli": "6.0.1",
-		"webpack-dev-middleware": "7.4.2",
-		"webpack-dev-server": "5.2.1",
+		"webpack-dev-middleware": "7.4.5",
+		"webpack-dev-server": "5.2.2",
 		"webpack-hot-middleware": "2.26.1",
 		"webpack-hot-server-middleware": "0.6.1",
 		"webpack-manifest-plugin": "5.0.0",
 		"webpack-merge": "6.0.1",
 		"webpack-messages": "2.0.4",
 		"webpack-node-externals": "3.0.0",
-		"webpack-sources": "3.2.3",
+		"webpack-sources": "3.3.3",
 		"zod": "3.22.4"
 	}
 }