Merge branch 'main' into sa-add-caption-to-video-atom

Author: SiAdcock

.github/CODEOWNERS

@@ -1,8 +1,27 @@
 # This file is matched from top down; subsequent matches override previous matches.
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# By default all files are owned by these teams:
-* 												@guardian/dotcom-platform
+# Files at the root of the project
+/*                                              @guardian/dotcom-platform
 
-/dotcom-rendering/src/components/marketing/ 	@guardian/growth
-/dotcom-rendering/src/client/userFeatures/ 		@guardian/supporter-revenue-stream
+/.github/                                       @guardian/dotcom-platform
+/.husky/                                        @guardian/dotcom-platform
+/.vscode/                                       @guardian/dotcom-platform
+/apps-rendering/                                @guardian/dotcom-platform
+
+# Files at the root of `/dotcom-rendering`
+/dotcom-rendering/*                             @guardian/dotcom-platform
+
+/dotcom-rendering/.storybook/                   @guardian/dotcom-platform
+/dotcom-rendering/cdk/                          @guardian/dotcom-platform
+/dotcom-rendering/configs/                      @guardian/dotcom-platform
+/dotcom-rendering/scripts/                      @guardian/dotcom-platform
+/dotcom-rendering/src/client/islands/           @guardian/dotcom-platform
+/dotcom-rendering/src/client/userFeatures/      @guardian/supporter-revenue-stream
+/dotcom-rendering/src/components/AdBlock*       @guardian/commercial-dev
+/dotcom-rendering/src/components/AdSlot*        @guardian/commercial-dev
+/dotcom-rendering/src/components/AdP*           @guardian/commercial-dev
+/dotcom-rendering/src/components/marketing/     @guardian/growth
+/dotcom-rendering/src/server/                   @guardian/dotcom-platform
+/dotcom-rendering/webpack/                      @guardian/dotcom-platform
+/scripts/                                       @guardian/dotcom-platform

.github/workflows/ar-chromatic.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Chromatic - Apps Rendering
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
-        uses: chromaui/action@v11.3.0
+        uses: chromaui/action@v11.27.0
 
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__APPS_RENDERING }}

.github/workflows/bundle-analyser.yml

@@ -26,13 +26,6 @@ jobs:
           path: dotcom-rendering/dist/stats/client.web-bundles.html
           if-no-files-found: error
 
-      - name: Archive code coverage results for web legacy bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: bundle-analyser-report-web-legacy
-          path: dotcom-rendering/dist/stats/client.web.legacy-bundles.html
-          if-no-files-found: error
-
       - name: Archive code coverage results for web variant bundle
         uses: actions/upload-artifact@v4
         with:

.github/workflows/dcr-chromatic.yml

@@ -11,12 +11,8 @@ jobs:
     name: Chromatic
     runs-on: ubuntu-latest
     # Run Chromatic only if `run_chromatic` label has been applied or we're
-    # pushing to `main`. Skip if this is a Dependabot PR as this is handled
-    # by the subsequent job.
-    if: |
-      (contains(github.event.pull_request.labels.*.name, 'run_chromatic')  ||  github.ref == 'refs/heads/main') &&
-      (!contains(github.event.pull_request.labels.*.name, 'dependencies') &&
-      github.event.pull_request.user.login != 'dependabot')
+    # pushing to `main`.
+    if: contains(github.event.pull_request.labels.*.name, 'run_chromatic')  ||  github.ref == 'refs/heads/main'
     steps:
       - name: Checkout - On Pull Request
         uses: actions/checkout@v4
@@ -39,7 +35,7 @@ jobs:
       - name: Chromatic - DCR
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
-        uses: chromaui/action@v11.3.0
+        uses: chromaui/action@v11.27.0
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__DOTCOM_RENDERING }}
           token: ${{ secrets.GITHUB_TOKEN }}

.husky/post-merge

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 RED='\033[0;31m'
 ENDCOLOR='\033[0m'
 

.husky/pre-commit

@@ -1,9 +1,5 @@
-#!/bin/sh
-
 # don't run this on CI
 # https://typicode.github.io/husky/#/?id=with-env-variables
 [ -n "$CI" ] && exit 0
 
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm lint-staged

.husky/pre-push

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 currentBranch="$(git rev-parse --abbrev-ref HEAD)"
 
 if [[ $currentBranch == "main" ]]

.nvmrc

@@ -1 +1 @@
-20.15.1
+22.14.0