From ffaded0b3060b1b95d76b16a159af5703b235656 Mon Sep 17 00:00:00 2001
From: Gabriel Dugny <gabriel.dugny@believe.com>
Date: Wed, 11 Mar 2026 08:42:02 +0100
Subject: [PATCH] chore: lint & changeset

Signed-off-by: Gabriel Dugny <gabriel.dugny@believe.com>
---
 .changeset/silver-snails-pull.md                    | 13 ++++---------
 .../templates/backend-plugin/package.json.hbs       |  2 +-
 plugins/auth-backend/src/service/OidcRouter.ts      |  2 +-
 .../src/service/request/entitiesBatchRequest.ts     |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.changeset/silver-snails-pull.md b/.changeset/silver-snails-pull.md
index e9b79ccdc8..b6bbacf39d 100644
--- a/.changeset/silver-snails-pull.md
+++ b/.changeset/silver-snails-pull.md
@@ -20,12 +20,14 @@
 '@backstage/plugin-auth-backend-module-okta-provider': patch
 '@backstage/plugin-scaffolder-backend-module-github': patch
 '@backstage/plugin-scaffolder-backend-module-gitlab': patch
+'@backstage/plugin-user-settings-backend': patch
 '@backstage/frontend-plugin-api': patch
 '@backstage/frontend-test-utils': patch
 '@internal/scaffolder': patch
 '@backstage/backend-plugin-api': patch
 '@backstage/backend-test-utils': patch
 '@backstage/plugin-mcp-actions-backend': patch
+'@backstage/filter-predicates': patch
 '@backstage/plugin-permission-backend': patch
 '@backstage/plugin-scaffolder-backend': patch
 '@backstage/backend-defaults': patch
@@ -42,22 +44,15 @@
 '@backstage/plugin-search-backend': patch
 '@backstage/core-app-api': patch
 '@backstage/plugin-catalog-react': patch
-'@backstage/plugin-techdocs-node': patch
+'@backstage/plugin-auth-backend': patch
 '@backstage/repo-tools': patch
-'@backstage/plugin-app-backend': patch
-'@backstage/plugin-mui-to-bui': patch
 '@backstage/plugin-scaffolder': patch
-'example-app-next': patch
 '@backstage/cli-node': patch
-'@backstage/plugin-app-react': patch
 '@backstage/plugin-auth-node': patch
 '@backstage/plugin-api-docs': patch
-'@backstage/plugin-app-node': patch
 '@backstage/cli': patch
 '@backstage/plugin-home': patch
-'@backstage/ui': patch
 '@backstage/plugin-app': patch
-'@backstage/plugin-org': patch
 ---
 
-Updated dependency `zod` to `3.25.76 || ^4.0.0`
+Updated dependency `zod` to `^3.25.76 || ^4.0.0` & migrated to `/v3` or `/v4` imports.
diff --git a/packages/cli-module-new/templates/backend-plugin/package.json.hbs b/packages/cli-module-new/templates/backend-plugin/package.json.hbs
index c1555a058f..eb08e2a54b 100644
--- a/packages/cli-module-new/templates/backend-plugin/package.json.hbs
+++ b/packages/cli-module-new/templates/backend-plugin/package.json.hbs
@@ -29,7 +29,7 @@
     "@backstage/plugin-catalog-node": "{{versionQuery '@backstage/plugin-catalog-node'}}",
     "express": "{{versionQuery 'express' '4.17.1'}}",
     "express-promise-router": "{{versionQuery 'express-promise-router' '4.1.0'}}",
-    "zod": "{{versionQuery 'zod' '3.25.76 || ^4.0.0'}}"
+    "zod": "{{versionQuery 'zod' '^3.25.76 || ^4.0.0'}}"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "{{versionQuery '@backstage/backend-test-utils'}}",
diff --git a/plugins/auth-backend/src/service/OidcRouter.ts b/plugins/auth-backend/src/service/OidcRouter.ts
index 304bfa5ed9..e7ed82b6bd 100644
--- a/plugins/auth-backend/src/service/OidcRouter.ts
+++ b/plugins/auth-backend/src/service/OidcRouter.ts
@@ -28,7 +28,7 @@ import { OidcDatabase } from '../database/OidcDatabase';
 import { OfflineAccessService } from './OfflineAccessService';
 import { json } from 'express';
 import { z } from 'zod/v4';
-import { fromZodError } from 'zod-validation-error';
+import { fromZodError } from 'zod-validation-error/v4';
 import { OidcError } from './OidcError';
 
 function ensureTrailingSlash(url: string): string {
diff --git a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
index 09e40f45bc..02ad1d5566 100644
--- a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
+++ b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
@@ -22,6 +22,7 @@ import {
 import { Request } from 'express';
 import { z } from 'zod/v3';
 import { fromZodError } from 'zod-validation-error/v3';
+
 const filterPredicateSchema = createZodV3FilterPredicateSchema(z);
 
 const schema = z.object({