Merge remote-tracking branch 'origin/main' into hugoh/fix-scenes-template

hugohaggmark · hugohaggmark · commit 5340b71badde · 2026-02-26T13:02:09.000+01:00
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -391,7 +391,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/231133?v=4",
       "profile": "http://www.paulmarbach.com/",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     }
   ],
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -114,6 +114,16 @@
       "matchUpdateTypes": ["patch"],
       "matchPackageNames": ["!/^@?docusaurus/", "!/@grafana/*/"]
     },
+    {
+      "automerge": true,
+      "groupName": "plugin-e2e template version",
+      "labels": ["dependencies", "javascript", "release", "patch"],
+      "matchManagers": ["custom.regex"],
+      "matchPackageNames": ["@grafana/plugin-e2e"],
+      "minimumReleaseAge": null,
+      "prPriority": 10,
+      "prConcurrentLimit": 0
+    },
     {
       "automerge": false,
       "groupName": "create-plugin template github actions",
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -476,7 +476,7 @@ jobs:
           npx -y knip --config ../packed-artifacts/knip.json --reporter markdown --no-exit-code
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Failing build due to test failures (canary versions)
+      - name: Failing build due to test failures (latest versions)
         if: steps.run-e2e-tests.outcome != 'success' || steps.run-e2e-tests-min-version.outcome != 'success'
         run: exit 1
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,44 @@
+# (Thu Feb 26 2026)
+
+#### 🐛 Bug Fix
+
+- `@grafana/create-plugin@6.10.3`
+  - chore(deps): update dependency @grafana/plugin-e2e to v3.4.0 [#2483](https://github.com/grafana/plugin-tools/pull/2483) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+
+#### Authors: 1
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+
+---
+
+# (Wed Feb 25 2026)
+
+#### 🚀 Enhancement
+
+- `@grafana/plugin-e2e@3.4.0`
+  - A11y: add fixture and matcher for a11y tests with Axe [#2462](https://github.com/grafana/plugin-tools/pull/2462) ([@fastfrwrd](https://github.com/fastfrwrd))
+
+#### Authors: 1
+
+- Paul Marbach ([@fastfrwrd](https://github.com/fastfrwrd))
+
+---
+
+# (Wed Feb 25 2026)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: Bump plugin-e2e [#2480](https://github.com/grafana/plugin-tools/pull/2480) ([@sunker](https://github.com/sunker))
+- `@grafana/create-plugin@6.10.2`
+  - chore(deps): update dependency @grafana/plugin-e2e to v3.3.3 [#2446](https://github.com/grafana/plugin-tools/pull/2446) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+
+#### Authors: 2
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+- Erik Sundell ([@sunker](https://github.com/sunker))
+
+---
+
 # (Tue Feb 24 2026)
 
 #### 🐛 Bug Fix
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/apps/renovate-sh-app"><img src="https://avatars.githubusercontent.com/u/7195757?v=4?s=100" width="100px;" alt=""/><br /><sub><b>renovate-sh-app[bot]</b></sub></a><br /><a href="https://github.com/grafana/plugin-tools/commits?author=renovate-sh-app[bot]" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/apps/grafana-plugins-platform-bot"><img src="https://avatars.githubusercontent.com/u/7195757?v=4?s=100" width="100px;" alt=""/><br /><sub><b>grafana-plugins-platform-bot[bot]</b></sub></a><br /><a href="https://github.com/grafana/plugin-tools/commits?author=grafana-plugins-platform-bot[bot]" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.paulmarbach.com/"><img src="https://avatars.githubusercontent.com/u/231133?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Marbach</b></sub></a><br /><a href="https://github.com/grafana/plugin-tools/commits?author=fastfrwrd" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.paulmarbach.com/"><img src="https://avatars.githubusercontent.com/u/231133?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Marbach</b></sub></a><br /><a href="https://github.com/grafana/plugin-tools/commits?author=fastfrwrd" title="Code">💻</a> <a href="https://github.com/grafana/plugin-tools/commits?author=fastfrwrd" title="Documentation">📖</a></td>
   </tr>
 </table>
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/create-plugin/CHANGELOG.md b/packages/create-plugin/CHANGELOG.md
@@ -1,3 +1,27 @@
+# v6.10.3 (Thu Feb 26 2026)
+
+#### 🐛 Bug Fix
+
+- chore(deps): update dependency @grafana/plugin-e2e to v3.4.0 [#2483](https://github.com/grafana/plugin-tools/pull/2483) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+
+#### Authors: 1
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+
+---
+
+# v6.10.2 (Wed Feb 25 2026)
+
+#### 🐛 Bug Fix
+
+- chore(deps): update dependency @grafana/plugin-e2e to v3.3.3 [#2446](https://github.com/grafana/plugin-tools/pull/2446) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+
+#### Authors: 1
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+
+---
+
 # v6.10.1 (Mon Feb 16 2026)
 
 #### 🐛 Bug Fix
diff --git a/packages/create-plugin/package.json b/packages/create-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.10.1",
+  "version": "6.10.3",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
diff --git a/packages/create-plugin/templates/common/_package.json b/packages/create-plugin/templates/common/_package.json
@@ -17,7 +17,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@grafana/eslint-config": "^9.0.0",
-    "@grafana/plugin-e2e": "^3.3.0",
+    "@grafana/plugin-e2e": "^3.4.0",
     "@grafana/tsconfig": "^2.0.1",
     "@playwright/test": "^1.57.0",{{#if useExperimentalRspack}}
     "@rspack/core": "^1.6.0",
diff --git a/packages/plugin-e2e/CHANGELOG.md b/packages/plugin-e2e/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v3.4.0 (Wed Feb 25 2026)
+
+#### 🚀 Enhancement
+
+- A11y: add fixture and matcher for a11y tests with Axe [#2462](https://github.com/grafana/plugin-tools/pull/2462) ([@fastfrwrd](https://github.com/fastfrwrd))
+
+#### Authors: 1
+
+- Paul Marbach ([@fastfrwrd](https://github.com/fastfrwrd))
+
+---
+
 # v3.3.3 (Tue Feb 24 2026)
 
 #### 🐛 Bug Fix
diff --git a/packages/plugin-e2e/README.md b/packages/plugin-e2e/README.md
@@ -16,6 +16,7 @@ end-to-end test Grafana plugins with ease.
 - **Custom Models:** Provides custom models that represent pages and components in Grafana, simplifying maintenance and creating reusable code to avoid repetition.
 - **Expect Matchers:** Includes a range of expect matchers that are specialized for Grafana plugin assertions, helping you validate plugin behavior more effectively.
 - **Version Compatibility:** Ensures that your plugin is tested across multiple versions of Grafana, guaranteeing compatibility and stability.
+- **Accessibility testing:** Integration with Axe to support configurable accessibility tests within your tests, with default rules aligned with Grafana's [WCAG2AA](https://www.w3.org/TR/WCAG21/) target.
 - **Integration with Playwright:** Seamlessly integrates with the Playwright testing framework, leveraging its powerful browser automation capabilities.
 
 ## Get started
diff --git a/packages/plugin-e2e/package.json b/packages/plugin-e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -34,11 +34,15 @@
     "node": ">=20 <=24"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.52.0"
+    "@axe-core/playwright": "^4.11.1",
+    "@playwright/test": "^1.52.0",
+    "axe-core": "^4.11.1"
   },
   "devDependencies": {
+    "@axe-core/playwright": "^4.11.1",
     "@playwright/test": "^1.58.1",
     "@types/uuid": "^11.0.0",
+    "axe-core": "^4.11.1",
     "dotenv": "^17.2.4"
   },
   "dependencies": {
diff --git a/packages/plugin-e2e/src/fixtures/scanForA11yViolations.ts b/packages/plugin-e2e/src/fixtures/scanForA11yViolations.ts
@@ -0,0 +1,38 @@
+import AxeBuilder from '@axe-core/playwright';
+import { TestFixture } from '@playwright/test';
+import { AxeResults } from 'axe-core';
+
+import { PlaywrightArgs, AxeScanContext } from '../types';
+
+export const DEFAULT_A11Y_TAGS = ['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa' /* 'best-practice' */];
+
+/**
+ * @alpha - the API for accessibility scanning is still being finalized and may change in future releases. Feedback is welcome!
+ */
+export const scanForA11yViolations: TestFixture<
+  (context?: AxeScanContext) => Promise<AxeResults>,
+  PlaywrightArgs
+> = async ({ page }, use, testInfo) => {
+  let inc = 1;
+  await use(async (context?: AxeScanContext) => {
+    const builder = new AxeBuilder({ page }).withTags(DEFAULT_A11Y_TAGS);
+    if (context?.options) {
+      builder.options(context!.options);
+    }
+    if (context?.include) {
+      builder.include(context!.include);
+    }
+    if (context?.exclude) {
+      builder.exclude(context!.exclude);
+    }
+
+    const accessibilityScanResults = await builder.analyze();
+
+    testInfo.attach(`axe-${inc++}`, {
+      body: JSON.stringify(accessibilityScanResults, null, 2),
+      contentType: 'application/json',
+    });
+
+    return accessibilityScanResults;
+  });
+};
diff --git a/packages/plugin-e2e/src/index.ts b/packages/plugin-e2e/src/index.ts
diff --git a/packages/plugin-e2e/src/matchers/toHaveNoA11yViolations.ts b/packages/plugin-e2e/src/matchers/toHaveNoA11yViolations.ts
diff --git a/packages/plugin-e2e/src/types.ts b/packages/plugin-e2e/src/types.ts
diff --git a/packages/plugin-e2e/tests/as-admin-user/a11y/accessibility.spec.ts b/packages/plugin-e2e/tests/as-admin-user/a11y/accessibility.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,8 @@`
`391`	`391`	`"avatar_url": "https://avatars.githubusercontent.com/u/231133?v=4",`
`392`	`392`	`"profile": "http://www.paulmarbach.com/",`
`393`	`393`	`"contributions": [`
`394`		`- "code"`
	`394`	`+ "code",`
	`395`	`+ "doc"`
`395`	`396`	`]`
`396`	`397`	`}`
`397`	`398`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@grafana/create-plugin",`
`3`		`- "version": "6.10.1",`
	`3`	`+ "version": "6.10.3",`
`4`	`4`	`"repository": {`
`5`	`5`	`"directory": "packages/create-plugin",`
`6`	`6`	`"url": "https://github.com/grafana/plugin-tools"`