From 1cd44ba91ed357233e0424c1b1aa202fb6f0b042 Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Fri, 4 Oct 2024 15:06:34 +0300
Subject: [PATCH] Use `pa11y-ci` instead of `pa11y`

---
 doc/sphinx/.sphinx/pa11y.json | 12 +++++++-----
 doc/sphinx/Makefile           |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/sphinx/.sphinx/pa11y.json b/doc/sphinx/.sphinx/pa11y.json
index 8df0cb9cb52..e75a672c68c 100644
--- a/doc/sphinx/.sphinx/pa11y.json
+++ b/doc/sphinx/.sphinx/pa11y.json
@@ -1,9 +1,11 @@
 {
-  "chromeLaunchConfig": {
-    "args": [
-      "--no-sandbox"
-    ]
+  "defaults": {
+    "chromeLaunchConfig": {
+      "args": [
+	"--no-sandbox"
+      ]
+    }
   },
   "reporter": "cli",
   "standard": "WCAG2AA"
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/Makefile b/doc/sphinx/Makefile
index 728b13e6d2b..03e93aa5453 100644
--- a/doc/sphinx/Makefile
+++ b/doc/sphinx/Makefile
@@ -9,7 +9,7 @@ SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = _build
 VENVDIR       = $(SPHINXDIR)/venv
-PA11Y         = $(SPHINXDIR)/node_modules/pa11y/bin/pa11y.js --config $(SPHINXDIR)/pa11y.json
+PA11Y         = $(SPHINXDIR)/node_modules/pa11y-ci/bin/pa11y-ci.js --config $(SPHINXDIR)/pa11y.json
 VENV          = $(VENVDIR)/bin/activate
 
 .PHONY: help full-help woke-install pa11y-install install run html epub serve \
@@ -64,9 +64,9 @@ woke-install:
 
 pa11y-install:
 	@type $(PA11Y) >/dev/null 2>&1 || { \
-			echo "Installing \"pa11y\" from npm... \n"; \
+			echo "Installing \"pa11y-ci\" from npm... \n"; \
 			mkdir -p $(SPHINXDIR)/node_modules/ ; \
-			npm install --prefix $(SPHINXDIR) pa11y; \
+			npm install --prefix $(SPHINXDIR) pa11y-ci; \
 		}
 
 install: $(VENVDIR)
@@ -135,7 +135,7 @@ woke: woke-install
 
 pa11y: pa11y-install html
 	cd ../build_doc/doc/sphinx; \
-	find $(BUILDDIR) -name *.html -print0 | xargs -n 1 -0 $(PA11Y)
+	$(PA11Y) $(shell find $(BUILDDIR) -name *.html);
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).