diff --git a/.changeset/large-paths-dance.md b/.changeset/large-paths-dance.md
new file mode 100644
index 0000000000..bf48c80579
--- /dev/null
+++ b/.changeset/large-paths-dance.md
@@ -0,0 +1,6 @@
+---
+'@sap-cloud-sdk/eslint-config': minor
+---
+
+[Compatibility Note] Replaced `eslint-plugin-import` with `eslint-plugin-import-x`.
+Please ensure that you have `eslint-plugin-import-x` installed.
diff --git a/.github/actions/check-license/index.js b/.github/actions/check-license/index.js
index db3235b2d1..1392598b0c 100644
--- a/.github/actions/check-license/index.js
+++ b/.github/actions/check-license/index.js
@@ -30928,7 +30928,7 @@ const list_namespaceObject = /*#__PURE__*/JSON.parse('[{"name":"Model","notes":"
 ;// CONCATENATED MODULE: ./lib/build-packages/check-license/index.js
 
 
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 
 // Permissive FLOSS licenses are ok, see https://blueoakcouncil.org/list for details.
 const ALLOWED_STATUSES = new Set(['Model', 'Gold', 'Silver', 'Bronze']);
diff --git a/.github/actions/check-public-api/index.js b/.github/actions/check-public-api/index.js
index 6fd824810d..b0517e1ee6 100644
--- a/.github/actions/check-public-api/index.js
+++ b/.github/actions/check-public-api/index.js
@@ -74045,7 +74045,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 
 // import directly from the files to avoid importing non-esm compatible functionality (e.g. __dirname)
 
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 
 
 const pathToTsConfigRoot = (0,node_path__WEBPACK_IMPORTED_MODULE_0__.join)(process.cwd(), 'tsconfig.json');
diff --git a/build-packages/changesets-fixed-version-bump/package.json b/build-packages/changesets-fixed-version-bump/package.json
index 0f95ef3d34..08917d6f53 100644
--- a/build-packages/changesets-fixed-version-bump/package.json
+++ b/build-packages/changesets-fixed-version-bump/package.json
@@ -23,7 +23,7 @@
     "@sap-cloud-sdk/test-util-build-internal": "workspace:^",
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "memfs": "^4.57.2",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
diff --git a/build-packages/check-license/index.ts b/build-packages/check-license/index.ts
index 0baad0f394..083ca9fcc0 100644
--- a/build-packages/check-license/index.ts
+++ b/build-packages/check-license/index.ts
@@ -1,6 +1,6 @@
 import { execFileSync } from 'node:child_process';
 import { info, setFailed } from '@actions/core';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import bloakList from '@blueoak/list/index.json' with { type: 'json' };
 
 // Permissive FLOSS licenses are ok, see https://blueoakcouncil.org/list for details.
diff --git a/build-packages/check-license/package.json b/build-packages/check-license/package.json
index 7ce42d2642..259aa6fa2a 100644
--- a/build-packages/check-license/package.json
+++ b/build-packages/check-license/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
   }
diff --git a/build-packages/check-pr/package.json b/build-packages/check-pr/package.json
index 076c20143e..c33528398e 100644
--- a/build-packages/check-pr/package.json
+++ b/build-packages/check-pr/package.json
@@ -23,7 +23,7 @@
     "@sap-cloud-sdk/test-util-build-internal": "workspace:^",
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "memfs": "^4.57.2",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
diff --git a/build-packages/check-public-api/check-public-api.spec.ts b/build-packages/check-public-api/check-public-api.spec.ts
index b60632f57e..b53210d31b 100644
--- a/build-packages/check-public-api/check-public-api.spec.ts
+++ b/build-packages/check-public-api/check-public-api.spec.ts
@@ -24,7 +24,7 @@ const {
   parseExportedObjectsInFile,
   regexExportedIndex,
   typeDescriptorPaths
-  // eslint-disable-next-line import/no-useless-path-segments
+  // eslint-disable-next-line import-x/no-useless-path-segments
 } = await import('./index.js');
 
 describe('check-public-api', () => {
diff --git a/build-packages/check-public-api/index.ts b/build-packages/check-public-api/index.ts
index 9c45e6dfb3..257c5b0245 100644
--- a/build-packages/check-public-api/index.ts
+++ b/build-packages/check-public-api/index.ts
@@ -10,9 +10,9 @@ import {
   readCompilerOptions,
   readIncludeExcludeWithDefaults,
   transpileDirectory
-  // eslint-disable-next-line import/no-internal-modules
+  // eslint-disable-next-line import-x/no-internal-modules
 } from '@sap-cloud-sdk/generator-common/dist/compiler.js';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { defaultPrettierConfig } from '@sap-cloud-sdk/generator-common/dist/file-writer/create-file.js';
 import { getPackages } from '@manypkg/get-packages';
 import type { CompilerOptions } from 'typescript';
diff --git a/build-packages/check-public-api/package.json b/build-packages/check-public-api/package.json
index e490be9fb3..950f7d3d67 100644
--- a/build-packages/check-public-api/package.json
+++ b/build-packages/check-public-api/package.json
@@ -27,7 +27,7 @@
     "@sap-cloud-sdk/test-util-build-internal": "workspace:^",
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "memfs": "^4.57.2",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
diff --git a/build-packages/get-changelog/package.json b/build-packages/get-changelog/package.json
index 728694ee35..e4615a4091 100644
--- a/build-packages/get-changelog/package.json
+++ b/build-packages/get-changelog/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
   }
diff --git a/build-packages/merge-and-write-changelogs/package.json b/build-packages/merge-and-write-changelogs/package.json
index 47f7b5ecc8..9116f1ea3e 100644
--- a/build-packages/merge-and-write-changelogs/package.json
+++ b/build-packages/merge-and-write-changelogs/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@vercel/ncc": "^0.38.4",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
   }
diff --git a/build-packages/test-utils/package.json b/build-packages/test-utils/package.json
index 1a29789fa7..a72babba4f 100644
--- a/build-packages/test-utils/package.json
+++ b/build-packages/test-utils/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3"
   }
diff --git a/eslint.config.js b/eslint.config.js
index 8a97cbf2f0..f72e9bb97f 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -12,7 +12,34 @@ const compat = new FlatCompat({
   allConfig: js.configs.all
 });
 
+const localPlugin = {
+  rules: {
+    'no-uppercase-internal-tag': {
+      meta: { type: 'problem', schema: [] },
+      create(context) {
+        return {
+          Program() {
+            for (const comment of context.sourceCode.getAllComments()) {
+              if (comment.value.includes('@Internal')) {
+                context.report({
+                  loc: comment.loc,
+                  message:
+                    'You are not allowed to use @Internal. Please use @internal.'
+                });
+              }
+            }
+          }
+        };
+      }
+    }
+  }
+};
+
 module.exports = defineConfig([
+  {
+    plugins: { local: localPlugin },
+    rules: { 'local/no-uppercase-internal-tag': 'error' }
+  },
   {
     languageOptions: {
       globals: {
@@ -20,29 +47,7 @@ module.exports = defineConfig([
         ...globals.jest
       },
       parser: tsParser,
-      sourceType: 'module',
-      parserOptions: {
-        project: {
-          extends: 'tsconfig.json',
-          include: ['**/*.ts'],
-
-          exclude: [
-            '**/*.d.ts',
-            '**/dist/**/*',
-            '**/node_modules/**/*',
-            'test-packages/test-services*/**/*',
-            'test-packages/test-services-e2e/**/*',
-            'test-packages/memory-tests/sdk-v1/test-service/*',
-            'test-packages/memory-tests/sdk-canary/test-service/*',
-            'build-packages/check-pr/lib/**',
-            'build-packages/get-changelog/lib/**',
-            'packages/rest-generator/test/test-services/**/*',
-            'test-resources/cli/**/*',
-            '**/test-output/**',
-            '**/README.md'
-          ]
-        }
-      }
+      sourceType: 'module'
     },
     extends: compat.extends('@sap-cloud-sdk'),
     rules: {
@@ -55,7 +60,7 @@ module.exports = defineConfig([
             'Enums are weird in TypeScript. Prefer union types or const objects instead.'
         }
       ],
-      'import/no-internal-modules': [
+      'import-x/no-internal-modules': [
         'error',
         {
           allow: ['@sap-cloud-sdk/**/internal', '@sap-cloud-sdk/**/internal.js']
@@ -85,7 +90,7 @@ module.exports = defineConfig([
   {
     files: ['**/test/**/*', '**/*.spec.ts'],
     rules: {
-      'import/no-internal-modules': 'off',
+      'import-x/no-internal-modules': 'off',
       'no-unused-expressions': 'off',
       'jsdoc/require-jsdoc': 'off'
     }
@@ -102,7 +107,7 @@ module.exports = defineConfig([
       'packages/connectivity/src/scp-cf/token-accessor.ts'
     ],
     rules: {
-      'import/no-internal-modules': [
+      'import-x/no-internal-modules': [
         'error',
         {
           allow: [
diff --git a/package.json b/package.json
index 4ddfa4bdfe..b1383e61d3 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "@types/voca": "^1.4.6",
     "axios": "^1.15.0",
     "depcheck": "^1.4.7",
-    "eslint": "^9.39.2",
+    "eslint": "^10.2.1",
     "execa": "^5.0.0",
     "glob": "^13.0.6",
     "globals": "^17.4.0",
diff --git a/packages/connectivity/internal.d.ts b/packages/connectivity/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/connectivity/internal.d.ts
+++ b/packages/connectivity/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/connectivity/src/http-agent/http-agent.spec.ts b/packages/connectivity/src/http-agent/http-agent.spec.ts
index 0ff8295115..9e455f39fa 100644
--- a/packages/connectivity/src/http-agent/http-agent.spec.ts
+++ b/packages/connectivity/src/http-agent/http-agent.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { X509Certificate } from 'node:crypto';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/connectivity/src/http-agent/http-agent.ts b/packages/connectivity/src/http-agent/http-agent.ts
index 1ed454c9d8..ab3815bd25 100644
--- a/packages/connectivity/src/http-agent/http-agent.ts
+++ b/packages/connectivity/src/http-agent/http-agent.ts
@@ -4,25 +4,25 @@ import https from 'node:https';
 import * as jks from 'jks-js';
 import { createLogger, last } from '@sap-cloud-sdk/util';
 /* Careful the proxy imports cause circular dependencies if imported from scp directly */
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { getProtocolOrDefault } from '../scp-cf/get-protocol';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { Cache, hashCacheKey } from '../scp-cf/cache';
 import {
   addProxyConfigurationInternet,
   getProxyConfig,
   proxyStrategy
-  // eslint-disable-next-line import/no-internal-modules
+  // eslint-disable-next-line import-x/no-internal-modules
 } from '../scp-cf/destination/http-proxy-util';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache';
 import type {
   Destination,
   DestinationCertificate,
   HttpDestination
-  // eslint-disable-next-line import/no-internal-modules
+  // eslint-disable-next-line import-x/no-internal-modules
 } from '../scp-cf/destination';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import type { BasicProxyConfiguration } from '../scp-cf/connectivity-service-types';
 import type { HttpAgentConfig, HttpsAgentConfig } from './agent-config';
 
diff --git a/packages/connectivity/src/scp-cf/authorization-header.ts b/packages/connectivity/src/scp-cf/authorization-header.ts
index e2da2bfeff..2cfe567709 100644
--- a/packages/connectivity/src/scp-cf/authorization-header.ts
+++ b/packages/connectivity/src/scp-cf/authorization-header.ts
@@ -4,7 +4,7 @@ import {
   encodeBase64,
   pickValueIgnoreCase
 } from '@sap-cloud-sdk/util';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { sanitizeDestination } from './destination/destination';
 import type {
   AuthenticationType,
diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts
index 6d605d524a..d0031c1c98 100644
--- a/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts
+++ b/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { X509Certificate } from 'node:crypto';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/connectivity/src/scp-cf/destination/register-destination-cache.spec.ts b/packages/connectivity/src/scp-cf/destination/register-destination-cache.spec.ts
index b087989767..acb9e94040 100644
--- a/packages/connectivity/src/scp-cf/destination/register-destination-cache.spec.ts
+++ b/packages/connectivity/src/scp-cf/destination/register-destination-cache.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { X509Certificate } from 'node:crypto';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts b/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts
index 4d71ebf14c..e859584d92 100644
--- a/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts
+++ b/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts
@@ -1,5 +1,5 @@
 import { createLogger } from '@sap-cloud-sdk/util';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { audiences, decodeJwt } from '../jwt/jwt';
 import { getServiceBindings } from './service-bindings';
 import type { JwtPayload } from '../jsonwebtoken-type';
diff --git a/packages/eslint-config/README.md b/packages/eslint-config/README.md
index 92e3de8a0c..19a2b85584 100644
--- a/packages/eslint-config/README.md
+++ b/packages/eslint-config/README.md
@@ -37,7 +37,7 @@ or if you want to combine this configuration with others:
 }
 ```
 
-This configuration depends on plugins "eslint-plugin-import" and "eslint-plugin-unused-imports", which need to be installed in your project.
+This configuration depends on plugins "eslint-plugin-import-x" and "eslint-plugin-unused-imports", which need to be installed in your project.
 
 ESlint merges these shareable configs with your configuration.
 Any rule configured in your `.eslintrc.js` will overwrite the setting for this rule in shareable configs.
diff --git a/packages/eslint-config/flat-config.js b/packages/eslint-config/flat-config.js
index b4f3e46c55..0d8d5b35c8 100644
--- a/packages/eslint-config/flat-config.js
+++ b/packages/eslint-config/flat-config.js
@@ -1,12 +1,34 @@
-/* eslint-disable @typescript-eslint/no-var-requires, import/no-internal-modules */
+/* eslint-disable @typescript-eslint/no-var-requires, import-x/no-internal-modules */
 const jsdoc = require('eslint-plugin-jsdoc');
-const regex = require('eslint-plugin-regex');
 const unusedImports = require('eslint-plugin-unused-imports');
-const importEslint = require('eslint-plugin-import');
+const importEslint = require('eslint-plugin-import-x');
+const { createTypeScriptImportResolver } = require('eslint-import-resolver-typescript');
 const tsEslint = require('typescript-eslint');
 const eslint = require('@eslint/js');
 const stylistic = require('@stylistic/eslint-plugin');
 
+const localRules = {
+  'no-uppercase-internal-tag': {
+    meta: { type: 'problem', schema: [] },
+    create(context) {
+      return {
+        Program() {
+          const comments = context.sourceCode.getAllComments();
+          for (const comment of comments) {
+            if (comment.value.includes('@Internal')) {
+              context.report({
+                loc: comment.loc,
+                message:
+                  'You are not allowed to use @Internal. Please use @internal.'
+              });
+            }
+          }
+        }
+      };
+    }
+  }
+};
+
 const flatConfig = [
   eslint.configs.recommended,
   ...tsEslint.configs.recommended,
@@ -22,26 +44,14 @@ const flatConfig = [
     ignores: ['**/*.d.ts', '**/dist/**/*', '**/node_modules/**/*'],
     plugins: {
       '@typescript-eslint': tsEslint.plugin,
-      import: importEslint,
+      'import-x': importEslint,
       'unused-imports': unusedImports,
       jsdoc,
-      regex,
+      local: { rules: localRules },
       '@stylistic': stylistic
     },
     rules: {
-      'regex/invalid': [
-        'error',
-        [
-          {
-            id: 'regexLowerCaseInternal',
-            // eslint-disable-next-line regex/invalid
-            regex: '\\@Internal',
-            message:
-              // eslint-disable-next-line regex/invalid
-              'You are not allowed to use @Internal. Please use @internal.'
-          }
-        ]
-      ],
+      'local/no-uppercase-internal-tag': 'error',
       '@stylistic/eol-last': 'error',
       '@stylistic/member-delimiter-style': [
         'error',
@@ -150,22 +160,22 @@ const flatConfig = [
           destructuredArrayIgnorePattern: '^_'
         }
       ],
-      'import/named': 'error',
-      'import/default': 'error',
-      'import/namespace': 'error',
-      'import/no-absolute-path': 'error',
-      'import/no-dynamic-require': 'error',
-      'import/no-internal-modules': 'error',
-      'import/no-self-import': 'error',
-      'import/no-cycle': 'error',
-      'import/no-useless-path-segments': [
+      'import-x/named': 'error',
+      'import-x/default': 'error',
+      'import-x/namespace': 'error',
+      'import-x/no-absolute-path': 'error',
+      'import-x/no-dynamic-require': 'error',
+      'import-x/no-internal-modules': 'error',
+      'import-x/no-self-import': 'error',
+      'import-x/no-cycle': 'error',
+      'import-x/no-useless-path-segments': [
         'error',
         {
           noUselessIndex: true
         }
       ],
-      'import/export': 'error',
-      'import/order': [
+      'import-x/export': 'error',
+      'import-x/order': [
         'error',
         {
           groups: [
@@ -180,7 +190,7 @@ const flatConfig = [
           ]
         }
       ],
-      'import/no-duplicates': 'error',
+      'import-x/no-duplicates': 'error',
       'unused-imports/no-unused-imports': 'error',
       'arrow-body-style': 'error',
       curly: 'error',
@@ -266,17 +276,14 @@ const flatConfig = [
       jsdoc: {
         ignoreInternal: true
       },
-      'import/resolver': {
-        typescript: true,
-        node: true
-      }
+      'import-x/resolver-next': [createTypeScriptImportResolver()]
     }
   },
   {
     files: ['**/test/**/*', '**/*.test.ts', '**/*.spec.ts'],
     rules: {
       '@typescript-eslint/explicit-module-boundary-types': 'off',
-      'import/no-internal-modules': 'off',
+      'import-x/no-internal-modules': 'off',
       '@typescript-eslint/no-unused-expressions': 'off',
       'jsdoc/require-jsdoc': 'off'
     }
diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js
index 4a12630b69..7d8b2f9803 100644
--- a/packages/eslint-config/index.js
+++ b/packages/eslint-config/index.js
@@ -6,20 +6,14 @@ module.exports = {
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    project: {
-      extends: 'tsconfig.json',
-      include: ['**/*.ts'],
-      exclude: ['**/*.d.ts', '**/dist/**/*', '**/node_modules/**/*']
-    },
     sourceType: 'module'
   },
   ignorePatterns: ['dist', 'node_modules'],
   plugins: [
     '@typescript-eslint',
-    'import',
+    'import-x',
     'unused-imports',
     'jsdoc',
-    'regex',
     '@stylistic'
   ],
   overrides: [
@@ -27,26 +21,14 @@ module.exports = {
       files: ['**/test/**/*', '**/*.spec.ts'],
       rules: {
         '@typescript-eslint/explicit-module-boundary-types': 'off',
-        'import/no-internal-modules': 'off',
+        'import-x/no-internal-modules': 'off',
         '@typescript-eslint/no-unused-expressions': 'off',
         'jsdoc/require-jsdoc': 'off',
-        'import/no-relative-parent-imports': 'off'
+        'import-x/no-relative-parent-imports': 'off'
       }
     }
   ],
   rules: {
-    'regex/invalid': [
-      'error',
-      [
-        {
-          id: 'regexLowerCaseInternal',
-          // eslint-disable-next-line regex/invalid
-          regex: '\\@Internal',
-          // eslint-disable-next-line regex/invalid
-          message: 'You are not allowed to use @Internal. Please use @internal.'
-        }
-      ]
-    ],
     '@stylistic/eol-last': 'error',
     '@stylistic/member-delimiter-style': [
       'error',
@@ -155,22 +137,22 @@ module.exports = {
         destructuredArrayIgnorePattern: '^_'
       }
     ],
-    'import/named': 'error',
-    'import/default': 'error',
-    'import/namespace': 'error',
-    'import/no-absolute-path': 'error',
-    'import/no-dynamic-require': 'error',
-    'import/no-internal-modules': 'error',
-    'import/no-self-import': 'error',
-    'import/no-cycle': 'error',
-    'import/no-useless-path-segments': [
+    'import-x/named': 'error',
+    'import-x/default': 'error',
+    'import-x/namespace': 'error',
+    'import-x/no-absolute-path': 'error',
+    'import-x/no-dynamic-require': 'error',
+    'import-x/no-internal-modules': 'error',
+    'import-x/no-self-import': 'error',
+    'import-x/no-cycle': 'error',
+    'import-x/no-useless-path-segments': [
       'error',
       {
         noUselessIndex: true
       }
     ],
-    'import/export': 'error',
-    'import/order': [
+    'import-x/export': 'error',
+    'import-x/order':  [
       'error',
       {
         groups: [
@@ -185,7 +167,7 @@ module.exports = {
         ]
       }
     ],
-    'import/no-duplicates': 'error',
+    'import-x/no-duplicates': 'error',
     'unused-imports/no-unused-imports': 'error',
     'arrow-body-style': 'error',
     curly: 'error',
@@ -273,9 +255,8 @@ module.exports = {
     jsdoc: {
       ignoreInternal: true
     },
-    'import/resolver': {
-      typescript: true,
-      node: true
+    'import-x/resolver': {
+      'eslint-import-resolver-typescript': {}
     }
   }
 };
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index 4744957a40..b6efa8190d 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -34,10 +34,9 @@
     "@typescript-eslint/parser": "^8.58.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-regex": "^1.10.0",
     "eslint-plugin-unused-imports": "^4.4.1",
     "typescript-eslint": "^8.58.0"
   },
diff --git a/packages/generator-common/internal.d.ts b/packages/generator-common/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/generator-common/internal.d.ts
+++ b/packages/generator-common/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/generator-common/src/compiler.spec.ts b/packages/generator-common/src/compiler.spec.ts
index 6e0b3c3adb..39cc6e286e 100644
--- a/packages/generator-common/src/compiler.spec.ts
+++ b/packages/generator-common/src/compiler.spec.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
 import { promises } from 'fs';
diff --git a/packages/generator-common/src/file-writer/copy-file.spec.ts b/packages/generator-common/src/file-writer/copy-file.spec.ts
index cabf77a580..85e9b1e190 100644
--- a/packages/generator-common/src/file-writer/copy-file.spec.ts
+++ b/packages/generator-common/src/file-writer/copy-file.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import * as fs from 'fs';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/generator-common/src/file-writer/create-file.spec.ts b/packages/generator-common/src/file-writer/create-file.spec.ts
index b85e02214e..25fa1858e6 100644
--- a/packages/generator-common/src/file-writer/create-file.spec.ts
+++ b/packages/generator-common/src/file-writer/create-file.spec.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
 import { readFile } from 'node:fs/promises';
diff --git a/packages/generator-common/src/options-parser.spec.ts b/packages/generator-common/src/options-parser.spec.ts
index 1bdd43474c..29514aab16 100644
--- a/packages/generator-common/src/options-parser.spec.ts
+++ b/packages/generator-common/src/options-parser.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { join, resolve } from 'path';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/generator/internal.d.ts b/packages/generator/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/generator/internal.d.ts
+++ b/packages/generator/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/generator/src/edmx-parser/v4/edmx-parser.ts b/packages/generator/src/edmx-parser/v4/edmx-parser.ts
index d0f063e5a4..57f356f7e6 100644
--- a/packages/generator/src/edmx-parser/v4/edmx-parser.ts
+++ b/packages/generator/src/edmx-parser/v4/edmx-parser.ts
@@ -7,7 +7,7 @@ import {
   parseEntityTypesBase
 } from '../common';
 import { forceArray } from '../../generator-utils';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { stripNamespace } from '../../edmx-to-vdm/edmx-to-vdm-util';
 import type {
   EdmxComplexType,
diff --git a/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts b/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts
index f3b2787a8f..be382f6032 100644
--- a/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts
+++ b/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts
@@ -1,7 +1,7 @@
 import { first } from '@sap-cloud-sdk/util';
 import voca from 'voca';
 import { isNullableProperty } from '../../generator-utils';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { getApiName } from '../../generator-without-ts-morph/service';
 import {
   getTypeMappingActionFunction,
diff --git a/packages/generator/src/generator-without-ts-morph/service/class.ts b/packages/generator/src/generator-without-ts-morph/service/class.ts
index b0b1b17603..e7cdd6e036 100644
--- a/packages/generator/src/generator-without-ts-morph/service/class.ts
+++ b/packages/generator/src/generator-without-ts-morph/service/class.ts
@@ -1,6 +1,6 @@
 import { codeBlock } from '@sap-cloud-sdk/util';
 import voca from 'voca';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { matchEntity } from '../entity-api/match-entity';
 import {
   getGenericTypes,
diff --git a/packages/generator/src/generator.spec.ts b/packages/generator/src/generator.spec.ts
index f4f5d3d1cc..90b71b6218 100644
--- a/packages/generator/src/generator.spec.ts
+++ b/packages/generator/src/generator.spec.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
 import { join, resolve } from 'path';
diff --git a/packages/generator/src/input-path-provider.spec.ts b/packages/generator/src/input-path-provider.spec.ts
index cb9baeedfc..ca91fc994e 100644
--- a/packages/generator/src/input-path-provider.spec.ts
+++ b/packages/generator/src/input-path-provider.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { sep } from 'path';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/generator/src/service-generator.spec.ts b/packages/generator/src/service-generator.spec.ts
index 77efda0599..7ab1d545b0 100644
--- a/packages/generator/src/service-generator.spec.ts
+++ b/packages/generator/src/service-generator.spec.ts
@@ -1,6 +1,6 @@
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { resolve } from 'path';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/http-client/internal.d.ts b/packages/http-client/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/http-client/internal.d.ts
+++ b/packages/http-client/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/odata-common/internal.d.ts b/packages/odata-common/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/odata-common/internal.d.ts
+++ b/packages/odata-common/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/odata-common/src/filter/filter-list.ts b/packages/odata-common/src/filter/filter-list.ts
index b262d8db25..e028a2b197 100644
--- a/packages/odata-common/src/filter/filter-list.ts
+++ b/packages/odata-common/src/filter/filter-list.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { OneToManyLink } from '../selectable/one-to-many-link';
 import type { DeSerializers } from '../de-serializers';
 import type { EntityBase, EntityIdentifiable } from '../entity-base';
diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts
index 7dde8bf562..7737d05af4 100644
--- a/packages/odata-common/src/order/orderable.ts
+++ b/packages/odata-common/src/order/orderable.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { Link } from '../selectable/link';
 import { Order } from './order';
 import type { DeSerializers } from '../de-serializers';
diff --git a/packages/odata-common/src/selectable/one-to-many-link.ts b/packages/odata-common/src/selectable/one-to-many-link.ts
index fb20dc3f7c..ddbd66b90c 100644
--- a/packages/odata-common/src/selectable/one-to-many-link.ts
+++ b/packages/odata-common/src/selectable/one-to-many-link.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { FilterLink } from '../filter/filter-link';
 import { Link } from './link';
 import type { EntityBase } from '../entity-base';
diff --git a/packages/odata-v2/internal.d.ts b/packages/odata-v2/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/odata-v2/internal.d.ts
+++ b/packages/odata-v2/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/odata-v2/src/de-serializers/entity-deserializer.ts b/packages/odata-v2/src/de-serializers/entity-deserializer.ts
index 3ac3eea0fb..3949ea8dc0 100644
--- a/packages/odata-v2/src/de-serializers/entity-deserializer.ts
+++ b/packages/odata-v2/src/de-serializers/entity-deserializer.ts
@@ -1,5 +1,5 @@
 import { entityDeserializer as entityDeserializerBase } from '@sap-cloud-sdk/odata-common';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { getLinkedCollectionResult } from '../request-builder/response-data-accessor';
 import { extractODataEtag } from '../extract-odata-etag';
 import type { EntityDeserializer } from '@sap-cloud-sdk/odata-common';
diff --git a/packages/odata-v4/internal.d.ts b/packages/odata-v4/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/odata-v4/internal.d.ts
+++ b/packages/odata-v4/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/odata-v4/src/de-serializers/entity-deserializer.ts b/packages/odata-v4/src/de-serializers/entity-deserializer.ts
index df9a7e7586..c5656f6205 100644
--- a/packages/odata-v4/src/de-serializers/entity-deserializer.ts
+++ b/packages/odata-v4/src/de-serializers/entity-deserializer.ts
@@ -1,6 +1,6 @@
 import { entityDeserializer as entityDeserializerBase } from '@sap-cloud-sdk/odata-common/internal';
 import { extractODataEtag } from '../extract-odata-etag';
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import { getLinkedCollectionResult } from '../request-builder/response-data-accessor';
 import type { EntityDeserializer } from '@sap-cloud-sdk/odata-common/internal';
 import type { DeSerializers } from './de-serializers';
diff --git a/packages/openapi-generator/internal.d.ts b/packages/openapi-generator/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/openapi-generator/internal.d.ts
+++ b/packages/openapi-generator/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts
index df90d6098e..aa8f1d7915 100644
--- a/packages/openapi-generator/src/generator.spec.ts
+++ b/packages/openapi-generator/src/generator.spec.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
 import { resolve } from 'path';
diff --git a/packages/openapi-generator/src/options/generator-options.spec.ts b/packages/openapi-generator/src/options/generator-options.spec.ts
index 7686435084..8d9cf1d15a 100644
--- a/packages/openapi-generator/src/options/generator-options.spec.ts
+++ b/packages/openapi-generator/src/options/generator-options.spec.ts
@@ -1,6 +1,6 @@
 import { mockFsWithUnionfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 mockFsWithUnionfs(jest);
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { join, resolve } from 'path';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/openapi/internal.d.ts b/packages/openapi/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/openapi/internal.d.ts
+++ b/packages/openapi/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/resilience/internal.d.ts b/packages/resilience/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/resilience/internal.d.ts
+++ b/packages/resilience/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/resilience/src/timeout.spec.ts b/packages/resilience/src/timeout.spec.ts
index 96d47c0c0c..93382a4274 100644
--- a/packages/resilience/src/timeout.spec.ts
+++ b/packages/resilience/src/timeout.spec.ts
@@ -47,7 +47,7 @@ describe('timeout', () => {
         }
       )
     ).resolves.not.toThrow();
-  }, 5000);
+  }, 15000);
 
   it('uses 10 seconds default timeout', async () => {
     const oneSecond = 1000;
diff --git a/packages/temporal-de-serializers/internal.d.ts b/packages/temporal-de-serializers/internal.d.ts
index 0498a27515..daf2ce5e82 100644
--- a/packages/temporal-de-serializers/internal.d.ts
+++ b/packages/temporal-de-serializers/internal.d.ts
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 export * from './dist/internal';
 // # sourceMappingURL=internal.d.ts.map
diff --git a/packages/test-util/src/test-destination-provider.spec.ts b/packages/test-util/src/test-destination-provider.spec.ts
index 9a164d6399..9db7681b47 100644
--- a/packages/test-util/src/test-destination-provider.spec.ts
+++ b/packages/test-util/src/test-destination-provider.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import { resolve } from 'path';
 import { jest } from '@jest/globals';
 import { vol } from 'memfs';
diff --git a/packages/util/src/logger/cloud-sdk-logger.spec.ts b/packages/util/src/logger/cloud-sdk-logger.spec.ts
index e81f460849..cf338c3f63 100644
--- a/packages/util/src/logger/cloud-sdk-logger.spec.ts
+++ b/packages/util/src/logger/cloud-sdk-logger.spec.ts
@@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';
 
 mockFsWithMemfs(jest);
 
-// eslint-disable-next-line import/order
+// eslint-disable-next-line import-x/order
 import * as fs from 'fs';
 import {
   expect,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cb036c192b..dba88a8653 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,7 +16,7 @@ importers:
         version: 3.3.5
       '@eslint/js':
         specifier: ^10.0.1
-        version: 10.0.1(eslint@9.39.4)
+        version: 10.0.1(eslint@10.3.0)
       '@jest/globals':
         specifier: ^30.3.0
         version: 30.3.0
@@ -54,8 +54,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       execa:
         specifier: ^5.0.0
         version: 5.1.1
@@ -130,8 +130,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       memfs:
         specifier: ^4.57.2
         version: 4.57.2(tslib@2.8.1)
@@ -158,8 +158,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       prettier:
         specifier: ^3.8.1
         version: 3.8.3
@@ -186,8 +186,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       memfs:
         specifier: ^4.57.2
         version: 4.57.2(tslib@2.8.1)
@@ -229,8 +229,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       prettier:
         specifier: ^3.8.1
         version: 3.8.3
@@ -251,8 +251,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       prettier:
         specifier: ^3.8.1
         version: 3.8.3
@@ -276,8 +276,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       prettier:
         specifier: ^3.8.1
         version: 3.8.3
@@ -298,8 +298,8 @@ importers:
         specifier: ^1.4.7
         version: 1.4.7
       eslint:
-        specifier: ^9.39.2
-        version: 9.39.4
+        specifier: ^10.2.1
+        version: 10.3.0
       prettier:
         specifier: ^3.8.1
         version: 3.8.3
@@ -378,19 +378,16 @@ importers:
         version: 10.1.8(eslint@9.39.4)
       eslint-import-resolver-typescript:
         specifier: ^4.4.4
-        version: 4.4.4(eslint-plugin-import@2.32.0)(eslint@9.39.4)
-      eslint-plugin-import:
-        specifier: ^2.32.0
-        version: 2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@4.4.4)(eslint@9.39.4)
+        version: 4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4))(eslint-plugin-import@2.32.0)(eslint@9.39.4)
+      eslint-plugin-import-x:
+        specifier: ^4.16.2
+        version: 4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4)
       eslint-plugin-jsdoc:
         specifier: ^62.9.0
         version: 62.9.0(eslint@9.39.4)
       eslint-plugin-prettier:
         specifier: ^5.5.5
         version: 5.5.5(eslint-config-prettier@10.1.8(eslint@9.39.4))(eslint@9.39.4)(prettier@3.8.3)
-      eslint-plugin-regex:
-        specifier: ^1.10.0
-        version: 1.10.0(eslint@9.39.4)
       eslint-plugin-unused-imports:
         specifier: ^4.4.1
         version: 4.4.1(@typescript-eslint/eslint-plugin@8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)
@@ -867,7 +864,7 @@ importers:
         version: 12.1.0(openapi-types@12.1.3)
       '@cap-js/sqlite':
         specifier: ^2.2.0
-        version: 2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
+        version: 2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
       '@jest/globals':
         specifier: ^30.3.0
         version: 30.3.0
@@ -900,10 +897,10 @@ importers:
         version: link:../../packages/util
       '@sap/cds':
         specifier: ^9.8.4
-        version: 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+        version: 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       '@sap/cds-dk':
         specifier: 9.9.0
-        version: 9.9.0(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+        version: 9.9.0(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       axios:
         specifier: ^1.15.0
         version: 1.16.0
@@ -1557,14 +1554,26 @@ packages:
     resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/config-array@0.23.5':
+    resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@eslint/config-helpers@0.4.2':
     resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/config-helpers@0.5.5':
+    resolution: {integrity: sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@eslint/core@0.17.0':
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/core@1.2.1':
+    resolution: {integrity: sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@eslint/eslintrc@3.3.5':
     resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1586,10 +1595,18 @@ packages:
     resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/object-schema@3.0.5':
+    resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@eslint/plugin-kit@0.4.1':
     resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/plugin-kit@0.7.1':
+    resolution: {integrity: sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@exodus/schemasafe@1.3.0':
     resolution: {integrity: sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==}
 
@@ -1960,6 +1977,9 @@ packages:
   '@open-draft/until@2.1.0':
     resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
 
+  '@package-json/types@0.0.12':
+    resolution: {integrity: sha512-uu43FGU34B5VM9mCNjXCwLaGHYjXdNincqKLaraaCW+7S2+SmiBg1Nv8bPnmschrIfZmfKNY9f3fC376MRrObw==}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -2183,6 +2203,9 @@ packages:
   '@types/eslint@7.29.0':
     resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
 
+  '@types/esrecurse@4.3.1':
+    resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}
+
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
@@ -3457,6 +3480,19 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
 
+  eslint-plugin-import-x@4.16.2:
+    resolution: {integrity: sha512-rM9K8UBHcWKpzQzStn1YRN2T5NvdeIfSVoKu/lKF41znQXHAUcBbYXe5wd6GNjZjTrP7viQ49n1D83x/2gYgIw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/utils': ^8.56.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint-import-resolver-node: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/utils':
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+
   eslint-plugin-import@2.32.0:
     resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
     engines: {node: '>=4'}
@@ -3487,12 +3523,6 @@ packages:
       eslint-config-prettier:
         optional: true
 
-  eslint-plugin-regex@1.10.0:
-    resolution: {integrity: sha512-C8/qYKkkbIb0epxKzaz4aw7oVAOmm19fJpR/moUrUToq/vc4xW4sEKMlTQqH6EtNGpvLjYsbbZRlWNWwQGeTSA==}
-    engines: {node: '>=6.0.0'}
-    peerDependencies:
-      eslint: '>=4.0.0'
-
   eslint-plugin-unused-imports@4.4.1:
     resolution: {integrity: sha512-oZGYUz1X3sRMGUB+0cZyK2VcvRX5lm/vB56PgNNcU+7ficUCKm66oZWKUubXWnOuPjQ8PvmXtCViXBMONPe7tQ==}
     peerDependencies:
@@ -3509,6 +3539,10 @@ packages:
     resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-scope@9.1.2:
+    resolution: {integrity: sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3521,6 +3555,16 @@ packages:
     resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
+  eslint@10.3.0:
+    resolution: {integrity: sha512-XbEXaRva5cF0ZQB8w6MluHA0kZZfV2DuCMJ3ozyEOHLwDpZX2Lmm/7Pp0xdJmI0GL1W05VH5VwIFHEm1Vcw2gw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+    hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+
   eslint@9.39.4:
     resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6424,24 +6468,24 @@ snapshots:
 
   '@blueoak/list@15.0.0': {}
 
-  '@cap-js/asyncapi@1.0.3(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))':
+  '@cap-js/asyncapi@1.0.3(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))':
     dependencies:
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
 
-  '@cap-js/db-service@2.11.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))':
+  '@cap-js/db-service@2.11.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))':
     dependencies:
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       generic-pool: 3.9.0
 
-  '@cap-js/openapi@1.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))':
+  '@cap-js/openapi@1.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))':
     dependencies:
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       pluralize: 8.0.0
 
-  '@cap-js/sqlite@2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))':
+  '@cap-js/sqlite@2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))':
     dependencies:
-      '@cap-js/db-service': 2.11.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@cap-js/db-service': 2.11.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       better-sqlite3: 12.9.0
 
   '@changesets/apply-release-plan@7.1.1':
@@ -6630,6 +6674,11 @@ snapshots:
 
   '@es-joy/resolve.exports@1.2.0': {}
 
+  '@eslint-community/eslint-utils@4.9.1(eslint@10.3.0)':
+    dependencies:
+      eslint: 10.3.0
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/eslint-utils@4.9.1(eslint@9.39.4)':
     dependencies:
       eslint: 9.39.4
@@ -6645,14 +6694,30 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@eslint/config-array@0.23.5':
+    dependencies:
+      '@eslint/object-schema': 3.0.5
+      debug: 4.4.3
+      minimatch: 10.2.5
+    transitivePeerDependencies:
+      - supports-color
+
   '@eslint/config-helpers@0.4.2':
     dependencies:
       '@eslint/core': 0.17.0
 
+  '@eslint/config-helpers@0.5.5':
+    dependencies:
+      '@eslint/core': 1.2.1
+
   '@eslint/core@0.17.0':
     dependencies:
       '@types/json-schema': 7.0.15
 
+  '@eslint/core@1.2.1':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
   '@eslint/eslintrc@3.3.5':
     dependencies:
       ajv: 6.14.0
@@ -6667,6 +6732,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@eslint/js@10.0.1(eslint@10.3.0)':
+    optionalDependencies:
+      eslint: 10.3.0
+
   '@eslint/js@10.0.1(eslint@9.39.4)':
     optionalDependencies:
       eslint: 9.39.4
@@ -6675,11 +6744,18 @@ snapshots:
 
   '@eslint/object-schema@2.1.7': {}
 
+  '@eslint/object-schema@3.0.5': {}
+
   '@eslint/plugin-kit@0.4.1':
     dependencies:
       '@eslint/core': 0.17.0
       levn: 0.4.1
 
+  '@eslint/plugin-kit@0.7.1':
+    dependencies:
+      '@eslint/core': 1.2.1
+      levn: 0.4.1
+
   '@exodus/schemasafe@1.3.0': {}
 
   '@gerrit0/mini-shiki@3.23.0':
@@ -7192,6 +7268,8 @@ snapshots:
 
   '@open-draft/until@2.1.0': {}
 
+  '@package-json/types@0.0.12': {}
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -7232,16 +7310,17 @@ snapshots:
       - react-native-b4a
       - supports-color
 
-  '@rtsao/scc@1.1.0': {}
+  '@rtsao/scc@1.1.0':
+    optional: true
 
   '@sap/cds-compiler@6.9.0': {}
 
-  '@sap/cds-dk@9.9.0(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)':
+  '@sap/cds-dk@9.9.0(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)':
     dependencies:
-      '@cap-js/asyncapi': 1.0.3(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
-      '@cap-js/openapi': 1.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
-      '@sap/cds-mtxs': 3.9.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))(hdb@2.27.1)
+      '@cap-js/asyncapi': 1.0.3(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
+      '@cap-js/openapi': 1.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
+      '@sap/cds-mtxs': 3.9.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))(hdb@2.27.1)
       '@sap/hdi-deploy': 5.6.1(hdb@2.27.1)
       express: 4.22.1
       hdb: 2.27.1
@@ -7251,7 +7330,7 @@ snapshots:
       xml-js: 1.6.11
       yaml: 2.8.3
     optionalDependencies:
-      '@cap-js/sqlite': 2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
+      '@cap-js/sqlite': 2.4.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
     transitivePeerDependencies:
       - '@eslint/js'
       - '@sap/hana-client'
@@ -7261,24 +7340,24 @@ snapshots:
       - tar
       - utf-8-validate
 
-  '@sap/cds-fiori@2.3.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))':
+  '@sap/cds-fiori@2.3.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))':
     dependencies:
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
 
-  '@sap/cds-mtxs@3.9.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))(hdb@2.27.1)':
+  '@sap/cds-mtxs@3.9.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))(hdb@2.27.1)':
     dependencies:
-      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)
+      '@sap/cds': 9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)
       '@sap/hdi-deploy': 5.6.1(hdb@2.27.1)
     transitivePeerDependencies:
       - '@sap/hana-client'
       - hdb
       - supports-color
 
-  '@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13)':
+  '@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13)':
     dependencies:
-      '@eslint/js': 10.0.1(eslint@9.39.4)
+      '@eslint/js': 10.0.1(eslint@10.3.0)
       '@sap/cds-compiler': 6.9.0
-      '@sap/cds-fiori': 2.3.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@9.39.4))(tar@7.5.13))
+      '@sap/cds-fiori': 2.3.0(@sap/cds@9.9.1(@eslint/js@10.0.1(eslint@10.3.0))(tar@7.5.13))
       express: 4.22.1
       yaml: 2.8.3
     optionalDependencies:
@@ -7459,6 +7538,8 @@ snapshots:
       '@types/estree': 1.0.8
       '@types/json-schema': 7.0.15
 
+  '@types/esrecurse@4.3.1': {}
+
   '@types/estree@1.0.8': {}
 
   '@types/fs-extra@11.0.4':
@@ -7493,7 +7574,8 @@ snapshots:
 
   '@types/json-schema@7.0.15': {}
 
-  '@types/json5@0.0.29': {}
+  '@types/json5@0.0.29':
+    optional: true
 
   '@types/jsonfile@6.1.4':
     dependencies:
@@ -7882,6 +7964,7 @@ snapshots:
     dependencies:
       call-bound: 1.0.4
       is-array-buffer: 3.0.5
+    optional: true
 
   array-differ@3.0.0: {}
 
@@ -7897,6 +7980,7 @@ snapshots:
       get-intrinsic: 1.3.0
       is-string: 1.1.1
       math-intrinsics: 1.1.0
+    optional: true
 
   array-union@2.1.0: {}
 
@@ -7909,6 +7993,7 @@ snapshots:
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
       es-shim-unscopables: 1.1.0
+    optional: true
 
   array.prototype.flat@1.3.3:
     dependencies:
@@ -7916,6 +8001,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.24.1
       es-shim-unscopables: 1.1.0
+    optional: true
 
   array.prototype.flatmap@1.3.3:
     dependencies:
@@ -7923,6 +8009,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.24.1
       es-shim-unscopables: 1.1.0
+    optional: true
 
   arraybuffer.prototype.slice@1.0.4:
     dependencies:
@@ -7933,6 +8020,7 @@ snapshots:
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
       is-array-buffer: 3.0.5
+    optional: true
 
   arrify@1.0.1: {}
 
@@ -7950,7 +8038,8 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  async-function@1.0.0: {}
+  async-function@1.0.0:
+    optional: true
 
   async-retry@1.3.3:
     dependencies:
@@ -7967,6 +8056,7 @@ snapshots:
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.1.0
+    optional: true
 
   axios@1.16.0:
     dependencies:
@@ -8183,6 +8273,7 @@ snapshots:
       es-define-property: 1.0.1
       get-intrinsic: 1.3.0
       set-function-length: 1.2.2
+    optional: true
 
   call-bound@1.0.4:
     dependencies:
@@ -8376,18 +8467,21 @@ snapshots:
       call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
+    optional: true
 
   data-view-byte-length@1.0.2:
     dependencies:
       call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
+    optional: true
 
   data-view-byte-offset@1.0.1:
     dependencies:
       call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
+    optional: true
 
   dayjs@1.11.15: {}
 
@@ -8398,6 +8492,7 @@ snapshots:
   debug@3.2.7:
     dependencies:
       ms: 2.1.3
+    optional: true
 
   debug@4.3.7:
     dependencies:
@@ -8435,12 +8530,14 @@ snapshots:
       es-define-property: 1.0.1
       es-errors: 1.3.0
       gopd: 1.2.0
+    optional: true
 
   define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
+    optional: true
 
   degenerator@5.0.1:
     dependencies:
@@ -8572,6 +8669,7 @@ snapshots:
   doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
+    optional: true
 
   dotenv@16.6.1: {}
 
@@ -8681,6 +8779,7 @@ snapshots:
       typed-array-length: 1.0.7
       unbox-primitive: 1.1.0
       which-typed-array: 1.1.20
+    optional: true
 
   es-define-property@1.0.1: {}
 
@@ -8700,12 +8799,14 @@ snapshots:
   es-shim-unscopables@1.1.0:
     dependencies:
       hasown: 2.0.2
+    optional: true
 
   es-to-primitive@1.3.0:
     dependencies:
       is-callable: 1.2.7
       is-date-object: 1.1.0
       is-symbol: 1.1.1
+    optional: true
 
   es6-promise@3.3.1: {}
 
@@ -8754,8 +8855,9 @@ snapshots:
       resolve: 1.22.11
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
-  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import@2.32.0)(eslint@9.39.4):
+  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4))(eslint-plugin-import@2.32.0)(eslint@9.39.4):
     dependencies:
       debug: 4.4.3
       eslint: 9.39.4
@@ -8767,6 +8869,7 @@ snapshots:
       unrs-resolver: 1.11.1
     optionalDependencies:
       eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@4.4.4)(eslint@9.39.4)
+      eslint-plugin-import-x: 4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4)
     transitivePeerDependencies:
       - supports-color
 
@@ -8777,7 +8880,27 @@ snapshots:
       '@typescript-eslint/parser': 8.59.2(eslint@9.39.4)(typescript@5.9.3)
       eslint: 9.39.4
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import@2.32.0)(eslint@9.39.4)
+      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4))(eslint-plugin-import@2.32.0)(eslint@9.39.4)
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
+  eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.4):
+    dependencies:
+      '@package-json/types': 0.0.12
+      '@typescript-eslint/types': 8.59.2
+      comment-parser: 1.4.6
+      debug: 4.4.3
+      eslint: 9.39.4
+      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
+      is-glob: 4.0.3
+      minimatch: 10.2.5
+      semver: 7.7.4
+      stable-hash-x: 0.2.0
+      unrs-resolver: 1.11.1
+    optionalDependencies:
+      '@typescript-eslint/utils': 8.59.2(eslint@9.39.4)(typescript@5.9.3)
+      eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
@@ -8809,6 +8932,7 @@ snapshots:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
+    optional: true
 
   eslint-plugin-jsdoc@62.9.0(eslint@9.39.4):
     dependencies:
@@ -8839,10 +8963,6 @@ snapshots:
     optionalDependencies:
       eslint-config-prettier: 10.1.8(eslint@9.39.4)
 
-  eslint-plugin-regex@1.10.0(eslint@9.39.4):
-    dependencies:
-      eslint: 9.39.4
-
   eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.59.2(@typescript-eslint/parser@8.59.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4):
     dependencies:
       eslint: 9.39.4
@@ -8856,12 +8976,54 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
+  eslint-scope@9.1.2:
+    dependencies:
+      '@types/esrecurse': 4.3.1
+      '@types/estree': 1.0.8
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
   eslint-visitor-keys@3.4.3: {}
 
   eslint-visitor-keys@4.2.1: {}
 
   eslint-visitor-keys@5.0.1: {}
 
+  eslint@10.3.0:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0)
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/config-array': 0.23.5
+      '@eslint/config-helpers': 0.5.5
+      '@eslint/core': 1.2.1
+      '@eslint/plugin-kit': 0.7.1
+      '@humanfs/node': 0.16.7
+      '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.4.3
+      '@types/estree': 1.0.8
+      ajv: 6.14.0
+      cross-spawn: 7.0.6
+      debug: 4.4.3
+      escape-string-regexp: 4.0.0
+      eslint-scope: 9.1.2
+      eslint-visitor-keys: 5.0.1
+      espree: 11.2.0
+      esquery: 1.7.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 8.0.0
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      json-stable-stringify-without-jsonify: 1.0.1
+      minimatch: 10.2.5
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+    transitivePeerDependencies:
+      - supports-color
+
   eslint@9.39.4:
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4)
@@ -9162,6 +9324,7 @@ snapshots:
   for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
+    optional: true
 
   foreground-child@3.3.1:
     dependencies:
@@ -9217,10 +9380,13 @@ snapshots:
       functions-have-names: 1.2.3
       hasown: 2.0.2
       is-callable: 1.2.7
+    optional: true
 
-  functions-have-names@1.2.3: {}
+  functions-have-names@1.2.3:
+    optional: true
 
-  generator-function@2.0.1: {}
+  generator-function@2.0.1:
+    optional: true
 
   generic-pool@3.9.0: {}
 
@@ -9266,6 +9432,7 @@ snapshots:
       call-bound: 1.0.4
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
+    optional: true
 
   get-tsconfig@4.13.7:
     dependencies:
@@ -9345,6 +9512,7 @@ snapshots:
     dependencies:
       define-properties: 1.2.1
       gopd: 1.2.0
+    optional: true
 
   globby@11.1.0:
     dependencies:
@@ -9374,17 +9542,20 @@ snapshots:
 
   hard-rejection@2.1.0: {}
 
-  has-bigints@1.1.0: {}
+  has-bigints@1.1.0:
+    optional: true
 
   has-flag@4.0.0: {}
 
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.1
+    optional: true
 
   has-proto@1.2.0:
     dependencies:
       dunder-proto: 1.0.1
+    optional: true
 
   has-symbols@1.1.0: {}
 
@@ -9515,6 +9686,7 @@ snapshots:
       es-errors: 1.3.0
       hasown: 2.0.2
       side-channel: 1.1.0
+    optional: true
 
   ip-address@10.2.0: {}
 
@@ -9527,6 +9699,7 @@ snapshots:
       call-bind: 1.0.8
       call-bound: 1.0.4
       get-intrinsic: 1.3.0
+    optional: true
 
   is-arrayish@0.2.1: {}
 
@@ -9537,10 +9710,12 @@ snapshots:
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
+    optional: true
 
   is-bigint@1.1.0:
     dependencies:
       has-bigints: 1.1.0
+    optional: true
 
   is-binary-path@2.1.0:
     dependencies:
@@ -9550,12 +9725,14 @@ snapshots:
     dependencies:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
+    optional: true
 
   is-bun-module@2.0.0:
     dependencies:
       semver: 7.7.4
 
-  is-callable@1.2.7: {}
+  is-callable@1.2.7:
+    optional: true
 
   is-core-module@2.16.1:
     dependencies:
@@ -9566,17 +9743,20 @@ snapshots:
       call-bound: 1.0.4
       get-intrinsic: 1.3.0
       is-typed-array: 1.1.15
+    optional: true
 
   is-date-object@1.1.0:
     dependencies:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
+    optional: true
 
   is-extglob@2.1.1: {}
 
   is-finalizationregistry@1.1.1:
     dependencies:
       call-bound: 1.0.4
+    optional: true
 
   is-fullwidth-code-point@3.0.0: {}
 
@@ -9589,6 +9769,7 @@ snapshots:
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
+    optional: true
 
   is-glob@4.0.3:
     dependencies:
@@ -9596,9 +9777,11 @@ snapshots:
 
   is-interactive@1.0.0: {}
 
-  is-map@2.0.3: {}
+  is-map@2.0.3:
+    optional: true
 
-  is-negative-zero@2.0.3: {}
+  is-negative-zero@2.0.3:
+    optional: true
 
   is-node-process@1.2.0: {}
 
@@ -9606,6 +9789,7 @@ snapshots:
     dependencies:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
+    optional: true
 
   is-number@7.0.0: {}
 
@@ -9621,14 +9805,17 @@ snapshots:
       gopd: 1.2.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
+    optional: true
 
   is-regexp@1.0.0: {}
 
-  is-set@2.0.3: {}
+  is-set@2.0.3:
+    optional: true
 
   is-shared-array-buffer@1.0.4:
     dependencies:
       call-bound: 1.0.4
+    optional: true
 
   is-stream@2.0.1: {}
 
@@ -9636,6 +9823,7 @@ snapshots:
     dependencies:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
+    optional: true
 
   is-subdir@1.2.0:
     dependencies:
@@ -9646,10 +9834,12 @@ snapshots:
       call-bound: 1.0.4
       has-symbols: 1.1.0
       safe-regex-test: 1.1.0
+    optional: true
 
   is-typed-array@1.1.15:
     dependencies:
       which-typed-array: 1.1.20
+    optional: true
 
   is-unicode-supported@0.1.0: {}
 
@@ -9657,20 +9847,24 @@ snapshots:
 
   is-url@1.2.4: {}
 
-  is-weakmap@2.0.2: {}
+  is-weakmap@2.0.2:
+    optional: true
 
   is-weakref@1.1.1:
     dependencies:
       call-bound: 1.0.4
+    optional: true
 
   is-weakset@2.0.4:
     dependencies:
       call-bound: 1.0.4
       get-intrinsic: 1.3.0
+    optional: true
 
   is-windows@1.0.2: {}
 
-  isarray@2.0.5: {}
+  isarray@2.0.5:
+    optional: true
 
   isexe@2.0.0: {}
 
@@ -10089,6 +10283,7 @@ snapshots:
   json5@1.0.2:
     dependencies:
       minimist: 1.2.8
+    optional: true
 
   json5@2.2.3: {}
 
@@ -10515,7 +10710,8 @@ snapshots:
 
   object-inspect@1.13.4: {}
 
-  object-keys@1.1.1: {}
+  object-keys@1.1.1:
+    optional: true
 
   object.assign@4.1.7:
     dependencies:
@@ -10525,6 +10721,7 @@ snapshots:
       es-object-atoms: 1.1.1
       has-symbols: 1.1.0
       object-keys: 1.1.1
+    optional: true
 
   object.fromentries@2.0.8:
     dependencies:
@@ -10532,12 +10729,14 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.24.1
       es-object-atoms: 1.1.1
+    optional: true
 
   object.groupby@1.0.3:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.24.1
+    optional: true
 
   object.values@1.2.1:
     dependencies:
@@ -10545,6 +10744,7 @@ snapshots:
       call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
+    optional: true
 
   on-finished@2.4.1:
     dependencies:
@@ -10616,6 +10816,7 @@ snapshots:
       get-intrinsic: 1.3.0
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
+    optional: true
 
   p-filter@2.1.0:
     dependencies:
@@ -10798,7 +10999,8 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  possible-typed-array-names@1.1.0: {}
+  possible-typed-array-names@1.1.0:
+    optional: true
 
   postcss-values-parser@6.0.2(postcss@8.5.10):
     dependencies:
@@ -11024,6 +11226,7 @@ snapshots:
       get-intrinsic: 1.3.0
       get-proto: 1.0.1
       which-builtin-type: 1.2.1
+    optional: true
 
   reftools@1.1.9: {}
 
@@ -11035,6 +11238,7 @@ snapshots:
       get-proto: 1.0.1
       gopd: 1.2.0
       set-function-name: 2.0.2
+    optional: true
 
   require-directory@2.1.1: {}
 
@@ -11098,6 +11302,7 @@ snapshots:
       get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       isarray: 2.0.5
+    optional: true
 
   safe-buffer@5.2.1: {}
 
@@ -11105,12 +11310,14 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
       isarray: 2.0.5
+    optional: true
 
   safe-regex-test@1.1.0:
     dependencies:
       call-bound: 1.0.4
       es-errors: 1.3.0
       is-regex: 1.2.1
+    optional: true
 
   safe-stable-stringify@2.5.0: {}
 
@@ -11168,6 +11375,7 @@ snapshots:
       get-intrinsic: 1.3.0
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
+    optional: true
 
   set-function-name@2.0.2:
     dependencies:
@@ -11175,12 +11383,14 @@ snapshots:
       es-errors: 1.3.0
       functions-have-names: 1.2.3
       has-property-descriptors: 1.0.2
+    optional: true
 
   set-proto@1.0.0:
     dependencies:
       dunder-proto: 1.0.1
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
+    optional: true
 
   setprototypeof@1.2.0: {}
 
@@ -11322,6 +11532,7 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
       internal-slot: 1.1.0
+    optional: true
 
   stream-to-array@2.3.0:
     dependencies:
@@ -11366,6 +11577,7 @@ snapshots:
       es-abstract: 1.24.1
       es-object-atoms: 1.1.1
       has-property-descriptors: 1.0.2
+    optional: true
 
   string.prototype.trimend@1.0.9:
     dependencies:
@@ -11373,12 +11585,14 @@ snapshots:
       call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
+    optional: true
 
   string.prototype.trimstart@1.0.8:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
+    optional: true
 
   string_decoder@1.3.0:
     dependencies:
@@ -11625,6 +11839,7 @@ snapshots:
       json5: 1.0.2
       minimist: 1.2.8
       strip-bom: 3.0.0
+    optional: true
 
   tsconfig-paths@4.2.0:
     dependencies:
@@ -11692,6 +11907,7 @@ snapshots:
       call-bound: 1.0.4
       es-errors: 1.3.0
       is-typed-array: 1.1.15
+    optional: true
 
   typed-array-byte-length@1.0.3:
     dependencies:
@@ -11700,6 +11916,7 @@ snapshots:
       gopd: 1.2.0
       has-proto: 1.2.0
       is-typed-array: 1.1.15
+    optional: true
 
   typed-array-byte-offset@1.0.4:
     dependencies:
@@ -11710,6 +11927,7 @@ snapshots:
       has-proto: 1.2.0
       is-typed-array: 1.1.15
       reflect.getprototypeof: 1.0.10
+    optional: true
 
   typed-array-length@1.0.7:
     dependencies:
@@ -11719,6 +11937,7 @@ snapshots:
       is-typed-array: 1.1.15
       possible-typed-array-names: 1.1.0
       reflect.getprototypeof: 1.0.10
+    optional: true
 
   typed-query-selector@2.12.2: {}
 
@@ -11757,6 +11976,7 @@ snapshots:
       has-bigints: 1.1.0
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
+    optional: true
 
   undici-types@6.21.0: {}
 
@@ -11872,6 +12092,7 @@ snapshots:
       is-number-object: 1.1.1
       is-string: 1.1.1
       is-symbol: 1.1.1
+    optional: true
 
   which-builtin-type@1.2.1:
     dependencies:
@@ -11888,6 +12109,7 @@ snapshots:
       which-boxed-primitive: 1.1.1
       which-collection: 1.0.2
       which-typed-array: 1.1.20
+    optional: true
 
   which-collection@1.0.2:
     dependencies:
@@ -11895,6 +12117,7 @@ snapshots:
       is-set: 2.0.3
       is-weakmap: 2.0.2
       is-weakset: 2.0.4
+    optional: true
 
   which-typed-array@1.1.20:
     dependencies:
@@ -11905,6 +12128,7 @@ snapshots:
       get-proto: 1.0.1
       gopd: 1.2.0
       has-tostringtag: 1.0.2
+    optional: true
 
   which@1.3.1:
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4d7444c78f..d3e0902b14 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -35,10 +35,14 @@ packages:
 
 blockExoticSubdeps: true
 minimumReleaseAge: 5760
-minimumReleaseAgeExclude:
+minimumReleaseAgeExclude: []
   # Add minimum age exceptions for audit issues here
   # - sample-package@0.1.0
 
 trustPolicyIgnoreAfter: 131400 # 3 months
 trustPolicy: no-downgrade
+allowBuilds:
+  better-sqlite3: false
+  puppeteer: false
+  unrs-resolver: false
 shellEmulator: true