Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 2 additions & 1 deletion .github/workflows/pkg-pr-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ jobs:
- name: Build
run: yarn build

- run: yarn dlx pkg-pr-new publish --compact
- name: Publish
run: yarn dlx pkg-pr-new publish --compact
7 changes: 2 additions & 5 deletions .github/workflows/size-limit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
- master
- v3.x

permissions:
contents: read
pull-requests: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -29,7 +25,8 @@ jobs:
- name: Install Dependencies
run: yarn --immutable

- uses: andresz1/[email protected]
- name: Check Size Limit
uses: andresz1/size-limit-action@94bc357df29c36c8f8d50ea497c3e225c3c95d1d # v1.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
skip_step: install
Expand Down
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.yarn
/auto-imports.d.ts
/pnpm-lock.yaml
.pnp.*
*.svg

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
compressionLevel: mixed

enableTelemetry: false

nodeLinker: node-modules
Expand All @@ -9,4 +7,4 @@ plugins:
path: .yarn/plugins/plugin-prepare-lifecycle.cjs
spec: 'https://github.com/un-es/yarn-plugin-prepare-lifecycle/releases/download/v0.0.1/index.js'

yarnPath: .yarn/releases/yarn-4.8.0.cjs
yarnPath: .yarn/releases/yarn-4.8.1.cjs
22 changes: 0 additions & 22 deletions auto-imports.d.ts

This file was deleted.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
],
"funding": "https://opencollective.com/eslint-import-resolver-typescript",
"license": "ISC",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"engines": {
"node": "^16.17.0 || >=18.6.0"
},
"main": "lib/index.cjs",
"types": "lib/index.d.ts",
"module": "lib/index.js",
"exports": {
".": {
Expand All @@ -37,7 +38,6 @@
},
"./package.json": "./package.json"
},
"types": "lib/index.d.ts",
"files": [
"index.d.cts",
"lib",
Expand Down Expand Up @@ -85,24 +85,24 @@
"unrs-resolver": "^1.3.3"
},
"devDependencies": {
"@1stg/common-config": "^11.1.0",
"@1stg/common-config": "^12.0.0",
"@changesets/changelog-github": "^0.5.1",
"@changesets/cli": "^2.28.1",
"@commitlint/cli": "^19.8.0",
"@mozilla/glean": "^5.0.3",
"@pkgr/core": "^0.2.0",
"@pkgr/rollup": "^6.0.1",
"@mozilla/glean": "^5.0.4",
"@pkgr/core": "^0.2.1",
"@pkgr/rollup": "^6.0.2",
"@total-typescript/ts-reset": "^0.6.1",
"@types/debug": "^4.1.12",
"@types/node": "^22.13.14",
"@types/node": "^22.14.0",
"@types/pnpapi": "^0.0.5",
"@types/unist": "^3.0.3",
"@vitest/coverage-v8": "3.0.9",
"@vitest/coverage-v8": "3.1.1",
"clean-pkg-json": "^1.2.1",
"dummy.js": "link:dummy.js",
"eslint": "^9.23.0",
"eslint-import-resolver-typescript": "link:.",
"eslint-plugin-import-x": "^4.9.3",
"eslint": "^9.24.0",
"eslint-import-resolver-typescript": "workspace:*",
"eslint-plugin-import-x": "^4.10.1",
"lint-staged": "^15.5.0",
"npm-run-all2": "^7.0.2",
"path-serializer": "^0.3.4",
Expand All @@ -113,13 +113,13 @@
"size-limit-preset-node-lib": "^0.3.0",
"tinyexec": "^1.0.1",
"type-coverage": "^2.29.7",
"typescript": "~5.8.2",
"unplugin-auto-import": "^19.1.2",
"vitest": "^3.0.9",
"typescript": "^5.8.3",
"vitest": "^3.1.1",
"yarn-berry-deduplicate": "^6.1.1"
},
"resolutions": {
"eslint-import-resolver-typescript": "link:.",
"es5-ext": "npm:@unes/es5-ext@latest",
"eslint-import-resolver-typescript": "workspace:*",
"prettier": "^3.5.3"
},
"typeCoverage": {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { isBuiltin } from 'node:module'
import path from 'node:path'

import type { ResolvedResult } from 'eslint-plugin-import-x/types.js'
import type { ResolvedResult } from 'eslint-plugin-import-x/types'
import {
type FileMatcher,
type TsConfigJsonResolved,
Expand Down
12 changes: 6 additions & 6 deletions tests/e2e/nestedPackageJson/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

__metadata:
version: 8
cacheKey: 10
cacheKey: 10c0

"@atlaskit/pragmatic-drag-and-drop@npm:^1.5.2":
version: 1.5.2
Expand All @@ -12,7 +12,7 @@ __metadata:
"@babel/runtime": "npm:^7.0.0"
bind-event-listener: "npm:^3.0.0"
raf-schd: "npm:^4.0.3"
checksum: 10/85009e9f819e8a6431632f4eff83b5f5928c708f51730d22590585600e000d26686cb03bb7a8e89a4f838e8d631786d81d82c71620f5c6d5d33ca51a205010c8
checksum: 10c0/1dace49fa384b532ca3ba363931e8c3b3d92632c02b259bc2823d2b443a8dd903a2c218d96aaceb3b715b9925a2438a570d09ed82287ab7180eabef89fd0fa43
languageName: node
linkType: hard

Expand All @@ -21,14 +21,14 @@ __metadata:
resolution: "@babel/runtime@npm:7.27.0"
dependencies:
regenerator-runtime: "npm:^0.14.0"
checksum: 10/e6966e03b695feb4c0ac0856a4355231c2580bf9ebd0298f47739f85c0ea658679dd84409daf26378d42c86c1cbe7e33feab709b14e784254b6c441d91606465
checksum: 10c0/35091ea9de48bd7fd26fb177693d64f4d195eb58ab2b142b893b7f3fa0f1d7c677604d36499ae0621a3703f35ba0c6a8f6c572cc8f7dc0317213841e493cf663
languageName: node
linkType: hard

"bind-event-listener@npm:^3.0.0":
version: 3.0.0
resolution: "bind-event-listener@npm:3.0.0"
checksum: 10/3d442307ee906b79f041433b065e7b259bd1e5231a74519271cc5beb485f7c469609da9c7f20fdd0b3ab340e4691fee826b76d003c71cf5ad955186aba5c256e
checksum: 10c0/08eadf1c7d3a58633f25c2bbd8dc066f77ef4e5df1049e81ff2f43a40c00f6581aba37387caa4878782b1f1f7c337b827757f52b637052a465ad74a7e1db8def
languageName: node
linkType: hard

Expand All @@ -43,13 +43,13 @@ __metadata:
"raf-schd@npm:^4.0.3":
version: 4.0.3
resolution: "raf-schd@npm:4.0.3"
checksum: 10/45514041c5ad31fa96aef3bb3c572a843b92da2f2cd1cb4a47c9ad58e48761d3a4126e18daa32b2bfa0bc2551a42d8f324a0e40e536cb656969929602b4e8b58
checksum: 10c0/ecabf0957c05fad059779bddcd992f1a9d3a35dfea439a6f0935c382fcf4f7f7fa60489e467b4c2db357a3665167d2a379782586b59712bb36c766e02824709b
languageName: node
linkType: hard

"regenerator-runtime@npm:^0.14.0":
version: 0.14.1
resolution: "regenerator-runtime@npm:0.14.1"
checksum: 10/5db3161abb311eef8c45bcf6565f4f378f785900ed3945acf740a9888c792f75b98ecb77f0775f3bf95502ff423529d23e94f41d80c8256e8fa05ed4b07cf471
checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
languageName: node
linkType: hard
1 change: 1 addition & 0 deletions tests/global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="vitest/globals" />
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/unit/pnp/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ enableGlobalCache: false

nodeLinker: pnp

yarnPath: .yarn/releases/yarn-4.8.0.cjs
yarnPath: .yarn/releases/yarn-4.8.1.cjs
2 changes: 1 addition & 1 deletion tests/unit/pnp/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pnp",
"type": "module",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"devDependencies": {
"lodash.zip": "^4.2.0"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pnp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

__metadata:
version: 8
cacheKey: 10
cacheKey: 10c0

"lodash.zip@npm:^4.2.0":
version: 4.2.0
resolution: "lodash.zip@npm:4.2.0"
checksum: 10/cb06530d81b520e27f1a5dbd4ec91df22f14977b56c267fa0eea7177eb407a048e5eb9a6baadbb1346ba607503211c36d763a74f933832c224a88b8d984cb4f9
checksum: 10c0/e596da80a6138e369998b50c78b51ed6cf984b4f239e59056aa18dca5972a213c491c511caf5888a2dec603c67265caf942099bec554a86a5c7ff1937d57f0e4
languageName: node
linkType: hard

Expand Down
10 changes: 5 additions & 5 deletions tests/unit/unit.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ describe('createTypeScriptImportResolver', async () => {
`)

expect(resolver.resolve('lodash.zip', testfile)).toMatchInlineSnapshot(`
{
"found": true,
"path": "<ROOT>/tests/unit/pnp/.yarn/cache/lodash.zip-npm-4.2.0-5299417ec8-cb06530d81.zip/node_modules/lodash.zip/index.js",
}
`)
{
"found": true,
"path": "<ROOT>/tests/unit/pnp/.yarn/cache/lodash.zip-npm-4.2.0-5299417ec8-e596da80a6.zip/node_modules/lodash.zip/index.js",
}
`)
})

it('should error on malformed tsconfig reference', () => {
Expand Down
7 changes: 1 addition & 6 deletions vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import autoImport from 'unplugin-auto-import/vite'
import { defineConfig } from 'vitest/config'

export default defineConfig({
Expand All @@ -10,12 +9,8 @@ export default defineConfig({
).pathname,
},
},
plugins: [
autoImport({
imports: ['vitest'],
}),
],
test: {
globals: true,
coverage: {
enabled: true,
include: ['src/**/*.ts'],
Expand Down
Loading