chore: migrate to rebranding unrs-resolver with new targets supported (#407)

Author: JounQin

.changeset/spicy-stingrays-remain.md

@@ -0,0 +1,10 @@
+---
+"eslint-import-resolver-typescript": patch
+---
+
+chore: migrate to rebranding `unrs-resolver` with new targets supported:
+
+- `i686-pc-windows-msvc`
+- `armv7-unknown-linux-musleabihf`
+- `powerpc64le-unknown-linux-gnu`
+- `s390x-unknown-linux-gnu`

.simple-git-hooks.cjs

@@ -0,0 +1 @@
+export { default } from '@1stg/simple-git-hooks'

.simple-git-hooks.js

@@ -25,14 +25,14 @@ This means you can:
 
 - [Notice](#notice)
 - [Installation](#installation)
-  - [`eslint-plugin-import`](#eslint-plugin-import)
   - [`eslint-plugin-import-x`](#eslint-plugin-import-x)
+  - [`eslint-plugin-import`](#eslint-plugin-import)
 - [Configuration](#configuration)
   - [`eslint.config.js`](#eslintconfigjs)
   - [`.eslintrc`](#eslintrc)
   - [Other environments](#other-environments)
     - [Bun](#bun)
-- [Options from `rspack-resolver`](#options-from-rspack-resolver)
+- [Options from `unrs-resolver`](#options-from-unrs-resolver)
   - [`conditionNames`](#conditionnames)
   - [`extensions`](#extensions)
   - [`extensionAlias`](#extensionalias)
@@ -53,30 +53,30 @@ If you're facing some problems on rules `import/default` or `import/named` from
 
 ## Installation
 
-### `eslint-plugin-import`
+### `eslint-plugin-import-x`
 
 ```sh
 # npm
-npm i -D eslint-plugin-import eslint-import-resolver-typescript
+npm i -D eslint-plugin-import-x eslint-import-resolver-typescript
 
 # pnpm
-pnpm i -D eslint-plugin-import eslint-import-resolver-typescript
+pnpm i -D eslint-plugin-import-x eslint-import-resolver-typescript
 
 # yarn
-yarn add -D eslint-plugin-import eslint-import-resolver-typescript
+yarn add -D eslint-plugin-import-x eslint-import-resolver-typescript
 ```
 
-### `eslint-plugin-import-x`
+### `eslint-plugin-import`
 
 ```sh
 # npm
-npm i -D eslint-plugin-import-x eslint-import-resolver-typescript
+npm i -D eslint-plugin-import eslint-import-resolver-typescript
 
 # pnpm
-pnpm i -D eslint-plugin-import-x eslint-import-resolver-typescript
+pnpm i -D eslint-plugin-import eslint-import-resolver-typescript
 
 # yarn
-yarn add -D eslint-plugin-import-x eslint-import-resolver-typescript
+yarn add -D eslint-plugin-import eslint-import-resolver-typescript
 ```
 
 ## Configuration
@@ -98,30 +98,27 @@ export default [
 
           bun: true, // resolve Bun modules https://github.com/import-js/eslint-import-resolver-typescript#bun
 
-          // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json by default
+          // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json or <root>/jsconfig.json by default
 
-          // use <root>/path/to/folder/tsconfig.json
+          // use <root>/path/to/folder/tsconfig.json or <root>/path/to/folder/jsconfig.json
           project: 'path/to/folder',
 
-          // Multiple tsconfigs (Useful for monorepos)
+          // Multiple tsconfigs/jsconfigs (Useful for monorepos, but discouraged in favor of `references` supported)
 
           // use a glob pattern
-          project: 'packages/*/tsconfig.json',
+          project: 'packages/*/{ts,js}config.json',
 
           // use an array
           project: [
             'packages/module-a/tsconfig.json',
-            'packages/module-b/tsconfig.json',
+            'packages/module-b/jsconfig.json',
           ],
 
           // use an array of glob patterns
           project: [
             'packages/*/tsconfig.json',
-            'other-packages/*/tsconfig.json',
+            'other-packages/*/jsconfig.json',
           ],
-
-          // use <root>/jsconfig.json
-          project: 'jsconfig.json',
         }),
       ],
     },
@@ -142,30 +139,27 @@ export default [
 
           bun: true, // resolve Bun modules https://github.com/import-js/eslint-import-resolver-typescript#bun
 
-          // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json by default
+          // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json or <root>/jsconfig.json by default
 
-          // use <root>/path/to/folder/tsconfig.json
+          // use <root>/path/to/folder/tsconfig.json or <root>/path/to/folder/jsconfig.json
           project: 'path/to/folder',
 
-          // Multiple tsconfigs (Useful for monorepos)
+          // Multiple tsconfigs/jsconfigs (Useful for monorepos, but discouraged in favor of `references` supported)
 
           // use a glob pattern
-          project: 'packages/*/tsconfig.json',
+          project: 'packages/*/{ts,js}config.json',
 
           // use an array
           project: [
             'packages/module-a/tsconfig.json',
-            'packages/module-b/tsconfig.json',
+            'packages/module-b/jsconfig.json',
           ],
 
           // use an array of glob patterns
           project: [
             'packages/*/tsconfig.json',
-            'other-packages/*/tsconfig.json',
+            'other-packages/*/jsconfig.json',
           ],
-
-          // use <root>/jsconfig.json
-          project: 'jsconfig.json',
         },
       },
     },
@@ -194,30 +188,27 @@ Add the following to your `.eslintrc` config:
 
         "bun": true, // resolve Bun modules https://github.com/import-js/eslint-import-resolver-typescript#bun
 
-        // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json by default
+        // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json or <root>/jsconfig.json by default
 
-        // use <root>/path/to/folder/tsconfig.json
+        // use <root>/path/to/folder/tsconfig.json or <root>/path/to/folder/jsconfig.json
         "project": "path/to/folder",
 
-        // Multiple tsconfigs (Useful for monorepos)
+        // Multiple tsconfigs (Useful for monorepos, but discouraged in favor of `references` supported)
 
         // use a glob pattern
-        "project": "packages/*/tsconfig.json",
+        "project": "packages/*/{ts,js}config.json",
 
         // use an array
         "project": [
           "packages/module-a/tsconfig.json",
-          "packages/module-b/tsconfig.json",
+          "packages/module-b/jsconfig.json",
         ],
 
         // use an array of glob patterns
         "project": [
           "packages/*/tsconfig.json",
-          "other-packages/*/tsconfig.json",
+          "other-packages/*/jsconfig.json",
         ],
-
-        // use <root>/jsconfig.json
-        "project": "jsconfig.json",
       },
     },
   },
@@ -236,7 +227,7 @@ Enable Bun built-in module resolution by choosing 1 out of these 3 options:
 - Run ESLint with `bun --bun eslint`
 - [Configure `run.bun` in `bunfig.toml`](https://bun.sh/docs/runtime/bunfig#run-bun-auto-alias-node-to-bun)
 
-## Options from [`rspack-resolver`][]
+## Options from [`unrs-resolver`][]
 
 ### `conditionNames`
 
@@ -320,7 +311,7 @@ Default:
 
 ### Other options
 
-You can pass through other options of [`rspack-resolver`][] directly
+You can pass through other options of [`unrs-resolver`][] directly
 
 ### Default options
 
@@ -361,6 +352,6 @@ Detailed changes for each release are documented in [CHANGELOG.md](./CHANGELOG.m
 
 [`eslint-plugin-import`]: https://github.com/import-js/eslint-plugin-import
 [`eslint-plugin-import-x`]: https://github.com/un-ts/eslint-plugin-import-x
-[`rspack-resolver`]: https://github.com/unrs/rspack-resolver
+[`unrs-resolver`]: https://github.com/unrs/unrs-resolver
 [`typescript`]: https://www.typescriptlang.org
 [isc]: https://opensource.org/licenses/ISC

README.md

@@ -3,10 +3,10 @@
   "version": "4.2.3",
   "type": "module",
   "description": "This plugin adds `TypeScript` support to `eslint-plugin-import`",
-  "repository": "git+https://github.com/import-js/eslint-import-resolver-typescript",
+  "repository": "https://github.com/import-js/eslint-import-resolver-typescript",
   "author": "Alex Gorbatchev <[email protected]>",
   "contributors": [
-    "JounQin (https://www.1stG.me) <[email protected]>"
+    "JounQin <[email protected]> (https://www.1stG.me)"
   ],
   "funding": "https://opencollective.com/unts/projects/eslint-import-resolver-ts",
   "license": "ISC",
@@ -80,34 +80,34 @@
     "debug": "^4.4.0",
     "get-tsconfig": "^4.10.0",
     "is-bun-module": "^2.0.0",
-    "rspack-resolver": "^1.2.2",
     "stable-hash": "^0.0.5",
-    "tinyglobby": "^0.2.12"
+    "tinyglobby": "^0.2.12",
+    "unrs-resolver": "^1.3.1"
   },
   "devDependencies": {
-    "@1stg/lib-config": "^13.0.1",
+    "@1stg/common-config": "^11.1.0",
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.28.1",
     "@commitlint/cli": "^19.8.0",
     "@mozilla/glean": "^5.0.3",
-    "@pkgr/rollup": "^6.0.0",
+    "@pkgr/rollup": "^6.0.1",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/debug": "^4.1.12",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.13",
     "@types/pnpapi": "^0.0.5",
     "@types/unist": "^3.0.3",
     "@vitest/coverage-v8": "3.0.9",
     "clean-pkg-json": "^1.2.1",
     "dummy.js": "link:dummy.js",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
     "eslint-import-resolver-typescript": "link:.",
-    "eslint-plugin-import-x": "^4.9.0",
+    "eslint-plugin-import-x": "^4.9.2",
     "lint-staged": "^15.5.0",
     "npm-run-all2": "^7.0.2",
     "path-serializer": "^0.3.4",
     "prettier": "^3.5.3",
     "react": "^19.0.0",
-    "simple-git-hooks": "^2.11.1",
+    "simple-git-hooks": "^2.12.1",
     "size-limit": "^11.2.0",
     "size-limit-preset-node-lib": "^0.3.0",
     "tinyexec": "^1.0.0",

package.json

@@ -9,8 +9,8 @@ import {
   parseTsconfig,
 } from 'get-tsconfig'
 import { isBunBuiltin } from 'is-bun-module'
-import { ResolverFactory } from 'rspack-resolver'
 import { stableHash } from 'stable-hash'
+import { ResolverFactory } from 'unrs-resolver'
 
 import { IMPORT_RESOLVER_NAME, JS_EXT_PATTERN } from './constants.js'
 import {
@@ -65,7 +65,7 @@ export const resolve = (
   options ||= {}
 
   // don't worry about node/bun core modules
-  if ((isBun || options.bun) ? isBunBuiltin(source) : isBuiltin(source)) {
+  if (isBun || options.bun ? isBunBuiltin(source) : isBuiltin(source)) {
     log('matched core:', source)
     return { found: true, path: null }
   }

src/index.ts

@@ -1,5 +1,5 @@
-import type { TsconfigOptions } from 'rspack-resolver'
 import { globSync, isDynamicPattern } from 'tinyglobby'
+import type { TsconfigOptions } from 'unrs-resolver'
 
 import {
   DEFAULT_CONFIGS,

src/normalize-options.ts

@@ -1,4 +1,4 @@
-import type { NapiResolveOptions } from 'rspack-resolver'
+import type { NapiResolveOptions } from 'unrs-resolver'
 
 export interface TypeScriptResolverOptions extends NapiResolveOptions {
   project?: string[] | string