Skip to content

Commit 26b8583

Browse files
committed
chore: bump unrs-resolver to v1.6.0
1 parent e36a0ac commit 26b8583

10 files changed

+930
-2050
lines changed

.changeset/serious-cheetahs-wink.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"eslint-import-resolver-typescript": patch
3+
---
4+
5+
chore: bump `unrs-resolver` to v1.6.0

.lintstagedrc.js renamed to .nano-staged.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import base from '@1stg/lint-staged/tsc'
1+
import base from '@1stg/nano-staged/tsc'
22

33
export default {
44
...base,

README.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ This means you can:
4040
- [Other options](#other-options)
4141
- [Default options](#default-options)
4242
- [Contributing](#contributing)
43-
- [Sponsors](#sponsors)
44-
- [Backers](#backers)
43+
- [Sponsors and Backers](#sponsors-and-backers)
44+
- [Sponsors](#sponsors)
45+
- [Backers](#backers)
4546
- [Changelog](#changelog)
4647
- [License](#license)
4748

@@ -328,15 +329,17 @@ We have [GitHub Actions](https://github.com/import-js/eslint-import-resolver-typ
328329

329330
If either fails, we won't be able to merge your PR until it's fixed.
330331

331-
[![Sponsors](https://raw.githubusercontent.com/1stG/static/master/sponsors.svg)](https://github.com/sponsors/JounQin)
332+
## Sponsors and Backers
332333

333-
## Sponsors
334+
[![Sponsors and Backers](https://raw.githubusercontent.com/1stG/static/master/sponsors.svg)](https://github.com/sponsors/JounQin)
335+
336+
### Sponsors
334337

335338
| 1stG | RxTS | UnTS |
336339
| ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
337340
| [![1stG Open Collective sponsors](https://opencollective.com/1stG/organizations.svg)](https://opencollective.com/1stG) | [![RxTS Open Collective sponsors](https://opencollective.com/rxts/organizations.svg)](https://opencollective.com/rxts) | [![UnTS Open Collective sponsors](https://opencollective.com/unts/organizations.svg)](https://opencollective.com/unts) |
338341

339-
## Backers
342+
### Backers
340343

341344
| 1stG | RxTS | UnTS |
342345
| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |

eslint.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import base from '@1stg/eslint-config'
44

55
/**
6-
* @import {TSESLint} from '@typescript-eslint/utils'
76
* @type {TSESLint.FlatConfig.ConfigArray}
7+
* @import { TSESLint } from '@typescript-eslint/utils'
88
*/
99
const config = [
1010
{

package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -81,29 +81,30 @@
8181
"get-tsconfig": "^4.10.0",
8282
"is-bun-module": "^2.0.0",
8383
"stable-hash": "^0.0.5",
84-
"tinyglobby": "^0.2.12",
85-
"unrs-resolver": "^1.4.1"
84+
"tinyglobby": "^0.2.13",
85+
"unrs-resolver": "^1.6.0"
8686
},
8787
"devDependencies": {
88-
"@1stg/common-config": "^12.0.0",
88+
"@1stg/common-config": "^13.0.1",
8989
"@changesets/changelog-github": "^0.5.1",
90-
"@changesets/cli": "^2.28.1",
90+
"@changesets/cli": "^2.29.2",
9191
"@commitlint/cli": "^19.8.0",
9292
"@mozilla/glean": "^5.0.4",
93-
"@pkgr/core": "^0.2.1",
94-
"@pkgr/rollup": "^6.0.2",
93+
"@pkgr/core": "^0.2.4",
94+
"@pkgr/rollup": "^6.0.3",
9595
"@total-typescript/ts-reset": "^0.6.1",
9696
"@types/debug": "^4.1.12",
97-
"@types/node": "^22.14.0",
97+
"@types/node": "^22.14.1",
9898
"@types/pnpapi": "^0.0.5",
9999
"@types/unist": "^3.0.3",
100100
"@vitest/coverage-v8": "3.1.1",
101+
"@vitest/eslint-plugin": "^1.1.43",
101102
"clean-pkg-json": "^1.2.1",
102103
"dummy.js": "link:dummy.js",
103-
"eslint": "^9.24.0",
104+
"eslint": "^9.25.0",
104105
"eslint-import-resolver-typescript": "workspace:*",
105-
"eslint-plugin-import-x": "^4.10.1",
106-
"lint-staged": "^15.5.0",
106+
"eslint-plugin-import-x": "^4.10.5",
107+
"nano-staged": "^0.8.0",
107108
"npm-run-all2": "^7.0.2",
108109
"path-serializer": "^0.3.4",
109110
"prettier": "^3.5.3",
@@ -115,10 +116,9 @@
115116
"type-coverage": "^2.29.7",
116117
"typescript": "^5.8.3",
117118
"vitest": "^3.1.1",
118-
"yarn-berry-deduplicate": "^6.1.1"
119+
"yarn-berry-deduplicate": "^6.1.3"
119120
},
120121
"resolutions": {
121-
"es5-ext": "npm:@unes/es5-ext@latest",
122122
"eslint-import-resolver-typescript": "workspace:*",
123123
"prettier": "^3.5.3"
124124
},

src/constants.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ export const defaultConditionNames = [
1515
]
1616

1717
/**
18-
* `.mts`, `.cts`, `.d.mts`, `.d.cts`, `.mjs`, `.cjs` are not included because `.cjs` and `.mjs` must be used explicitly
18+
* `.mts`, `.cts`, `.d.mts`, `.d.cts`, `.mjs`, `.cjs` are not included because
19+
* `.cjs` and `.mjs` must be used explicitly
1920
*/
2021
export const defaultExtensions = [
2122
'.ts',

src/helpers.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import fs from 'node:fs'
22
import path from 'node:path'
33

44
/**
5-
* For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`.
5+
* For a scoped package, we must look in `@types/foo__bar` instead of
6+
* `@types/@foo/bar`.
67
*/
78
export function mangleScopedPackage(moduleName: string) {
89
if (moduleName.startsWith('@')) {

src/types.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ import type { NapiResolveOptions } from 'unrs-resolver'
22

33
export interface TypeScriptResolverOptions extends NapiResolveOptions {
44
project?: string[] | string
5-
/**
6-
* @default true - whether to always try to resolve `@types` packages
7-
*/
5+
/** @default true - whether to always try to resolve `@types` packages */
86
alwaysTryTypes?: boolean
9-
/**
10-
* Whether `bun` core modules should be accounted
11-
*/
7+
/** Whether `bun` core modules should be accounted */
128
bun?: boolean
139
noWarnOnMultipleProjects?: boolean
1410
}

tests/e2e/base.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* @import {TSESLint} from '@typescript-eslint/utils'
32
* @param {string | string[]} project
43
* @returns {TSESLint.ClassicConfig.Config}
4+
* @import { TSESLint } from '@typescript-eslint/utils'
55
*/
66
const base = project => ({
77
extends: [

0 commit comments

Comments
 (0)