chore: remove unnecessary codes

Author: JounQin

package.json

@@ -27,7 +27,6 @@
   "types": "lib/index.d.ts",
   "files": [
     "lib",
-    "shim.d.ts",
     "!**/*.tsbuildinfo"
   ],
   "keywords": [
@@ -41,7 +40,7 @@
     "build": "run-p -c 'build:*'",
     "build:r": "r -f cjs,es2020",
     "build:ts": "tsc -b",
-    "eslint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint --cache",
+    "eslint": "ESLINT_USE_FLAT_CONFIG=false eslint --cache",
     "lint": "run-p 'lint:*'",
     "lint:es": "eslint . --cache",
     "lint:tsc": "tsc --noEmit",
@@ -97,7 +96,6 @@
     "@types/pnpapi": "^0.0.5",
     "@types/unist": "^3.0.3",
     "clean-pkg-json": "^1.2.1",
-    "cross-env": "^7.0.3",
     "dummy.js": "link:dummy.js",
     "eslint": "^9.22.0",
     "eslint-import-resolver-typescript": "link:.",

src/helpers.ts

@@ -14,15 +14,6 @@ export function mangleScopedPackage(moduleName: string) {
   return moduleName
 }
 
-/** Remove any trailing querystring from module id. */
-export function removeQuerystring(id: string) {
-  const querystringIndex = id.lastIndexOf('?')
-  if (querystringIndex !== -1) {
-    return id.slice(0, querystringIndex)
-  }
-  return id
-}
-
 export const tryFile = (
   filename?: string[] | string,
   includeDir = false,

src/index.ts

@@ -1,4 +1,4 @@
-import { isBuiltin } from 'node:module'
+import module from 'node:module'
 import path from 'node:path'
 
 import type { ResolvedResult } from 'eslint-plugin-import-x/types.js'
@@ -13,11 +13,7 @@ import { ResolverFactory } from 'rspack-resolver'
 import stableHash_ from 'stable-hash'
 
 import { IMPORT_RESOLVER_NAME, JS_EXT_PATTERN } from './constants.js'
-import {
-  mangleScopedPackage,
-  removeQuerystring,
-  sortProjectsByAffinity,
-} from './helpers.js'
+import { mangleScopedPackage, sortProjectsByAffinity } from './helpers.js'
 import { log } from './logger.js'
 import { normalizeOptions } from './normalize-options.js'
 import type { TypeScriptResolverOptions } from './types.js'
@@ -65,7 +61,7 @@ export const resolve = (
 ): ResolvedResult => {
   // don't worry about core node/bun modules
   if (
-    isBuiltin(source) ||
+    module.isBuiltin(source) ||
     (process.versions.bun &&
       isBunModule(source, process.versions.bun as Version))
   ) {
@@ -77,6 +73,15 @@ export const resolve = (
     }
   }
 
+  if (process.versions.pnp && source === 'pnpapi') {
+    return {
+      found: true,
+      path: module.findPnpApi(file).resolveToUnqualified(source, file, {
+        considerBuiltins: false,
+      }),
+    }
+  }
+
   options ||= {}
 
   if (!resolver) {
@@ -91,8 +96,6 @@ export const resolve = (
     resolver = cached
   }
 
-  source = removeQuerystring(source)
-
   options ||= {}
 
   // eslint-disable-next-line sonarjs/label-position, sonarjs/no-labels

src/normalize-options.ts

@@ -1,4 +1,4 @@
-import type { TsconfigOptions } from 'oxc-resolver'
+import type { TsconfigOptions } from 'rspack-resolver'
 import { globSync, isDynamicPattern } from 'tinyglobby'
 
 import {

yarn.lock

@@ -5886,19 +5886,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-env@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-env@npm:7.0.3"
-  dependencies:
-    cross-spawn: "npm:^7.0.1"
-  bin:
-    cross-env: src/bin/cross-env.js
-    cross-env-shell: src/bin/cross-env-shell.js
-  checksum: 10/e99911f0d31c20e990fd92d6fd001f4b01668a303221227cc5cb42ed155f086351b1b3bd2699b200e527ab13011b032801f8ce638e6f09f854bdf744095e604c
-  languageName: node
-  linkType: hard
-
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.5, cross-spawn@npm:^7.0.6":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.5, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -6703,7 +6691,6 @@ __metadata:
     "@types/pnpapi": "npm:^0.0.5"
     "@types/unist": "npm:^3.0.3"
     clean-pkg-json: "npm:^1.2.1"
-    cross-env: "npm:^7.0.3"
     debug: "npm:^4.4.0"
     dummy.js: "link:dummy.js"
     eslint: "npm:^9.22.0"