Skip to content

chore: bump unrs-resolver to v1.6.0 #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/serious-cheetahs-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-import-resolver-typescript": patch
---

chore: bump `unrs-resolver` to v1.6.0
2 changes: 1 addition & 1 deletion .lintstagedrc.js → .nano-staged.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import base from '@1stg/lint-staged/tsc'
import base from '@1stg/nano-staged/tsc'

export default {
...base,
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ This means you can:
- [Other options](#other-options)
- [Default options](#default-options)
- [Contributing](#contributing)
- [Sponsors](#sponsors)
- [Backers](#backers)
- [Sponsors and Backers](#sponsors-and-backers)
- [Sponsors](#sponsors)
- [Backers](#backers)
- [Changelog](#changelog)
- [License](#license)

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

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

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

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

### Sponsors

| 1stG | RxTS | UnTS |
| ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
| [![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) |

## Backers
### Backers

| 1stG | RxTS | UnTS |
| ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import base from '@1stg/eslint-config'

/**
* @import {TSESLint} from '@typescript-eslint/utils'
* @type {TSESLint.FlatConfig.ConfigArray}
* @import { TSESLint } from '@typescript-eslint/utils'
*/
const config = [
{
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,29 +81,30 @@
"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"
"tinyglobby": "^0.2.13",
"unrs-resolver": "^1.6.0"
},
"devDependencies": {
"@1stg/common-config": "^12.0.0",
"@1stg/common-config": "^13.0.1",
"@changesets/changelog-github": "^0.5.1",
"@changesets/cli": "^2.28.1",
"@changesets/cli": "^2.29.2",
"@commitlint/cli": "^19.8.0",
"@mozilla/glean": "^5.0.4",
"@pkgr/core": "^0.2.1",
"@pkgr/rollup": "^6.0.2",
"@pkgr/core": "^0.2.4",
"@pkgr/rollup": "^6.0.3",
"@total-typescript/ts-reset": "^0.6.1",
"@types/debug": "^4.1.12",
"@types/node": "^22.14.0",
"@types/node": "^22.14.1",
"@types/pnpapi": "^0.0.5",
"@types/unist": "^3.0.3",
"@vitest/coverage-v8": "3.1.1",
"@vitest/eslint-plugin": "^1.1.43",
"clean-pkg-json": "^1.2.1",
"dummy.js": "link:dummy.js",
"eslint": "^9.24.0",
"eslint": "^9.25.0",
"eslint-import-resolver-typescript": "workspace:*",
"eslint-plugin-import-x": "^4.10.1",
"lint-staged": "^15.5.0",
"eslint-plugin-import-x": "^4.10.5",
"nano-staged": "^0.8.0",
"npm-run-all2": "^7.0.2",
"path-serializer": "^0.3.4",
"prettier": "^3.5.3",
Expand All @@ -115,10 +116,9 @@
"type-coverage": "^2.29.7",
"typescript": "^5.8.3",
"vitest": "^3.1.1",
"yarn-berry-deduplicate": "^6.1.1"
"yarn-berry-deduplicate": "^6.1.3"
},
"resolutions": {
"es5-ext": "npm:@unes/es5-ext@latest",
"eslint-import-resolver-typescript": "workspace:*",
"prettier": "^3.5.3"
},
Expand Down
3 changes: 2 additions & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export const defaultConditionNames = [
]

/**
* `.mts`, `.cts`, `.d.mts`, `.d.cts`, `.mjs`, `.cjs` are not included because `.cjs` and `.mjs` must be used explicitly
* `.mts`, `.cts`, `.d.mts`, `.d.cts`, `.mjs`, `.cjs` are not included because
* `.cjs` and `.mjs` must be used explicitly
*/
export const defaultExtensions = [
'.ts',
Expand Down
3 changes: 2 additions & 1 deletion src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import fs from 'node:fs'
import path from 'node:path'

/**
* For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`.
* For a scoped package, we must look in `@types/foo__bar` instead of
* `@types/@foo/bar`.
*/
export function mangleScopedPackage(moduleName: string) {
if (moduleName.startsWith('@')) {
Expand Down
8 changes: 2 additions & 6 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@ import type { NapiResolveOptions } from 'unrs-resolver'

export interface TypeScriptResolverOptions extends NapiResolveOptions {
project?: string[] | string
/**
* @default true - whether to always try to resolve `@types` packages
*/
/** @default true - whether to always try to resolve `@types` packages */
alwaysTryTypes?: boolean
/**
* Whether `bun` core modules should be accounted
*/
/** Whether `bun` core modules should be accounted */
bun?: boolean
noWarnOnMultipleProjects?: boolean
}
2 changes: 1 addition & 1 deletion tests/e2e/base.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @import {TSESLint} from '@typescript-eslint/utils'
* @param {string | string[]} project
* @returns {TSESLint.ClassicConfig.Config}
* @import { TSESLint } from '@typescript-eslint/utils'
*/
const base = project => ({
extends: [
Expand Down
Loading