diff --git a/eslint.config.mjs b/eslint.config.mjs index df2e71390327b..40a6812018504 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -3,7 +3,7 @@ import globals from 'globals'; import js from '@eslint/js'; import ts from 'typescript-eslint'; import antiTrojanSource from 'eslint-plugin-anti-trojan-source'; -import { createOxcImportResolver } from 'eslint-import-resolver-oxc'; +import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript'; import importX from 'eslint-plugin-import-x'; import { configs as litConfigs } from 'eslint-plugin-lit'; import { configs as wcConfigs } from 'eslint-plugin-wc'; @@ -318,7 +318,7 @@ export default ts.config( 'import-x/parsers': { '@typescript-eslint/parser': ['.ts', '.tsx'], }, - 'import-x/resolver-next': [createOxcImportResolver()], + 'import-x/resolver-next': [createTypeScriptImportResolver()], }, }, { diff --git a/package.json b/package.json index ec54c0d3798fc..b41428cc05920 100644 --- a/package.json +++ b/package.json @@ -21399,7 +21399,7 @@ "esbuild-node-externals": "1.18.0", "esbuild-sass-plugin": "3.3.1", "eslint": "9.24.0", - "eslint-import-resolver-oxc": "0.13.1", + "eslint-import-resolver-typescript": "4.3.2", "eslint-plugin-anti-trojan-source": "1.1.1", "eslint-plugin-import-x": "4.9.4", "eslint-plugin-lit": "2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e7d89ab6411a0..0ae69f16aef11 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -222,9 +222,9 @@ importers: eslint: specifier: 9.24.0 version: 9.24.0(jiti@2.4.0) - eslint-import-resolver-oxc: - specifier: 0.13.1 - version: 0.13.1(eslint-plugin-import-x@4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.0)))(eslint@9.24.0(jiti@2.4.0))(webpack-cli@6.0.1)(webpack-merge@6.0.1)(webpack@5.99.3) + eslint-import-resolver-typescript: + specifier: 4.3.2 + version: 4.3.2(eslint-plugin-import-x@4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-plugin-import@2.29.1)(eslint@9.24.0(jiti@2.4.0)) eslint-plugin-anti-trojan-source: specifier: 1.1.1 version: 1.1.1 @@ -955,71 +955,6 @@ packages: resolution: {integrity: sha512-4VlGgo32k2EQ2wcCY3vEU28A0O13aOtHz3Xt2/2U5FAh9EfhD6t6DqL5Z6yAnRCntbTFDU4YfbpyzSlHNWycPw==} engines: {node: '>=14'} - '@oxc-resolver/binding-darwin-arm64@5.2.0': - resolution: {integrity: sha512-3v2eS1swAUZ/OPrBpTB5Imn4Xhbz4zKPa/mugnYCAC4pVt/miBQLBNciBRZG8oyHiGmLtjw/qanZC36uB6MITQ==} - cpu: [arm64] - os: [darwin] - - '@oxc-resolver/binding-darwin-x64@5.2.0': - resolution: {integrity: sha512-6uhnlZU+CBULQAjcwQ4nerA76xDEvPFtHpTzXhEoitr4a3Ks5H92X4uuLT0C0FW3RfhIVL8Lpp9pLYHN3oAvug==} - cpu: [x64] - os: [darwin] - - '@oxc-resolver/binding-freebsd-x64@5.2.0': - resolution: {integrity: sha512-6TCXw/rPnhBLlS/Rg7QHO9lBjwJSbUJMhd9POpVpQEK1S9viEAl8JPdxXuNCEDPJHSmpMrGt6+DTjQxQ5J1kpQ==} - cpu: [x64] - os: [freebsd] - - '@oxc-resolver/binding-linux-arm-gnueabihf@5.2.0': - resolution: {integrity: sha512-egjFYBKixAjekmiImCYkpwSo0bnZJOieJIc6cXePuCih2R5nFjkS1F8tSlJ18GdRZ1MmYveM6THmIHJCpnDqaQ==} - cpu: [arm] - os: [linux] - - '@oxc-resolver/binding-linux-arm64-gnu@5.2.0': - resolution: {integrity: sha512-Cizb3uHnEc2MYZeRnp+BxmDyAKo7szJxbTW4BgPvs+XicYZI0kc/qcZlHRoJImalBqvve+ZObasRqCS1zqub9A==} - cpu: [arm64] - os: [linux] - - '@oxc-resolver/binding-linux-arm64-musl@5.2.0': - resolution: {integrity: sha512-rDiRuIvQXa9MI8oiEbCVnU7dBVDuo74456dN3Bf30/Joz6FVBhYrhoOTxtxH+WgC38qCUWWuBjhFaLRLDLaMRw==} - cpu: [arm64] - os: [linux] - - '@oxc-resolver/binding-linux-riscv64-gnu@5.2.0': - resolution: {integrity: sha512-QRdE2DOO9e4oYzYyf/iRnLiomvs3bRedRTvFHbTAcL0JJfsicLLK4T7J5BP76sVum0QUAVJm+JqgEUmk8ETGXw==} - cpu: [riscv64] - os: [linux] - - '@oxc-resolver/binding-linux-s390x-gnu@5.2.0': - resolution: {integrity: sha512-bD8HDjnEziw1+Y7uowIRI9JaJd6vldLoVXOZaSeBRjofWk8rQOOyxfNTVymIrcmPE8rZZJfkDdGyCnTJP0h9vA==} - cpu: [s390x] - os: [linux] - - '@oxc-resolver/binding-linux-x64-gnu@5.2.0': - resolution: {integrity: sha512-eWEHGjkrk4Dsul7Wyt6X9UMxZ+e2zKgpRG2kbSZOQQTXf6ZnU9+lRAyAgf2X1qdLjmH0GT54wIak7fhSsuNWLA==} - cpu: [x64] - os: [linux] - - '@oxc-resolver/binding-linux-x64-musl@5.2.0': - resolution: {integrity: sha512-iojrjytDOdg4aWm25ak7qpTQwWj+D7O+duHBL2rQhDxIY1K4eysJwobWck0yzJ6VlONaQF6RLt+YeDpGoKV+ww==} - cpu: [x64] - os: [linux] - - '@oxc-resolver/binding-wasm32-wasi@5.2.0': - resolution: {integrity: sha512-Lgv3HjKUXRa/xMCgBAkwKQcPljAn5IRicjgoPBXGUhghzK/9yF2DTf7aXdVPvRxFKjvcyWtzpzPV2pzYCuBaBA==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-resolver/binding-win32-arm64-msvc@5.2.0': - resolution: {integrity: sha512-VK5yEOdGbIrb89gUtVIw2IVP4r0rEhiwVLQOD37vZhvrt5iY0FHOTtMz9ZsWI0anZ0swt26U2wRcJYT0/AsBfw==} - cpu: [arm64] - os: [win32] - - '@oxc-resolver/binding-win32-x64-msvc@5.2.0': - resolution: {integrity: sha512-BhIcyjr/gTafUrdOhd1EC5H4LeUSKK9uQIG2RSyMMH0Cq1yBacTb1yvLowhP/6e4ncCGByXEkW7sWGowCfSY8A==} - cpu: [x64] - os: [win32] - '@parcel/watcher-android-arm64@2.5.1': resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==} engines: {node: '>= 10.0.0'} @@ -2759,36 +2694,18 @@ packages: eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} - eslint-import-resolver-oxc@0.13.1: - resolution: {integrity: sha512-QL1NrZ7BjcOggOYeNUijIYBFoD2PBLBtLBEYJaWl1pD7Cx+PGc2P65izZKtJz+wqixZiodsvLVBcDvew1NDI2Q==} + eslint-import-resolver-typescript@4.3.2: + resolution: {integrity: sha512-T2LqBXj87ndEC9t1LrDiPkzalSFzD4rrXr6BTzGdgMx1jdQM4T972guQvg7Ih+LNO51GURXI/qMHS5GF3h1ilw==} engines: {node: ^16.17.0 || >=18.6.0} peerDependencies: - '@rspack/cli': '*' - '@rspack/core': '*' eslint: '*' eslint-plugin-import: '*' eslint-plugin-import-x: '*' - vite: '*' - webpack: '*' - webpack-cli: '*' - webpack-merge: '*' peerDependenciesMeta: - '@rspack/cli': - optional: true - '@rspack/core': - optional: true eslint-plugin-import: optional: true eslint-plugin-import-x: optional: true - vite: - optional: true - webpack: - optional: true - webpack-cli: - optional: true - webpack-merge: - optional: true eslint-module-utils@2.12.0: resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==} @@ -3403,6 +3320,9 @@ packages: resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} engines: {node: '>= 0.4'} + is-bun-module@2.0.0: + resolution: {integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==} + is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -4212,9 +4132,6 @@ packages: resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==} engines: {node: '>= 0.4'} - oxc-resolver@5.2.0: - resolution: {integrity: sha512-ce0rdG5Y0s1jhcvh2Zc6sD+fTw/WA4pUKWrPmjbniZjC/m6pPob2I2Pkz8T0YzdWsbAC98E00Bc7KNB1B6Tolg==} - p-limit@2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} @@ -6490,47 +6407,6 @@ snapshots: '@opentelemetry/semantic-conventions@1.30.0': {} - '@oxc-resolver/binding-darwin-arm64@5.2.0': - optional: true - - '@oxc-resolver/binding-darwin-x64@5.2.0': - optional: true - - '@oxc-resolver/binding-freebsd-x64@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-arm-gnueabihf@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-arm64-gnu@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-arm64-musl@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-riscv64-gnu@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-s390x-gnu@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-x64-gnu@5.2.0': - optional: true - - '@oxc-resolver/binding-linux-x64-musl@5.2.0': - optional: true - - '@oxc-resolver/binding-wasm32-wasi@5.2.0': - dependencies: - '@napi-rs/wasm-runtime': 0.2.8 - optional: true - - '@oxc-resolver/binding-win32-arm64-msvc@5.2.0': - optional: true - - '@oxc-resolver/binding-win32-x64-msvc@5.2.0': - optional: true - '@parcel/watcher-android-arm64@2.5.1': optional: true @@ -8454,25 +8330,29 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-oxc@0.13.1(eslint-plugin-import-x@4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.0)))(eslint@9.24.0(jiti@2.4.0))(webpack-cli@6.0.1)(webpack-merge@6.0.1)(webpack@5.99.3): + eslint-import-resolver-typescript@4.3.2(eslint-plugin-import-x@4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-plugin-import@2.29.1)(eslint@9.24.0(jiti@2.4.0)): dependencies: + debug: 4.4.0(supports-color@8.1.1) eslint: 9.24.0(jiti@2.4.0) - oxc-resolver: 5.2.0 + get-tsconfig: 4.10.0 + is-bun-module: 2.0.0 stable-hash: 0.0.5 + tinyglobby: 0.2.12 + unrs-resolver: 1.4.1 optionalDependencies: - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.0)) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-typescript@4.3.2)(eslint@9.24.0(jiti@2.4.0)) eslint-plugin-import-x: 4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3) - webpack: 5.99.3(@swc/core@1.11.18(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@6.0.1) - webpack-cli: 6.0.1(webpack-bundle-analyzer@4.10.2)(webpack@5.99.3) - webpack-merge: 6.0.1 + transitivePeerDependencies: + - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint@9.24.0(jiti@2.4.0)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@4.3.2)(eslint@9.24.0(jiti@2.4.0)): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3) eslint: 9.24.0(jiti@2.4.0) eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 4.3.2(eslint-plugin-import-x@4.9.4(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-plugin-import@2.29.1)(eslint@9.24.0(jiti@2.4.0)) transitivePeerDependencies: - supports-color optional: true @@ -8500,7 +8380,7 @@ snapshots: - supports-color - typescript - eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint@9.24.0(jiti@2.4.0)): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-typescript@4.3.2)(eslint@9.24.0(jiti@2.4.0)): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.6 @@ -8510,7 +8390,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.24.0(jiti@2.4.0) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint@9.24.0(jiti@2.4.0)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.29.1(eslint@9.24.0(jiti@2.4.0))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@4.3.2)(eslint@9.24.0(jiti@2.4.0)) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -9184,6 +9064,10 @@ snapshots: has-tostringtag: 1.0.2 optional: true + is-bun-module@2.0.0: + dependencies: + semver: 7.7.1 + is-callable@1.2.7: optional: true @@ -10103,22 +9987,6 @@ snapshots: safe-push-apply: 1.0.0 optional: true - oxc-resolver@5.2.0: - optionalDependencies: - '@oxc-resolver/binding-darwin-arm64': 5.2.0 - '@oxc-resolver/binding-darwin-x64': 5.2.0 - '@oxc-resolver/binding-freebsd-x64': 5.2.0 - '@oxc-resolver/binding-linux-arm-gnueabihf': 5.2.0 - '@oxc-resolver/binding-linux-arm64-gnu': 5.2.0 - '@oxc-resolver/binding-linux-arm64-musl': 5.2.0 - '@oxc-resolver/binding-linux-riscv64-gnu': 5.2.0 - '@oxc-resolver/binding-linux-s390x-gnu': 5.2.0 - '@oxc-resolver/binding-linux-x64-gnu': 5.2.0 - '@oxc-resolver/binding-linux-x64-musl': 5.2.0 - '@oxc-resolver/binding-wasm32-wasi': 5.2.0 - '@oxc-resolver/binding-win32-arm64-msvc': 5.2.0 - '@oxc-resolver/binding-win32-x64-msvc': 5.2.0 - p-limit@2.3.0: dependencies: p-try: 2.2.0