diff --git a/.size-limit.json b/.size-limit.json
index 648747e9..bdf75734 100644
--- a/.size-limit.json
+++ b/.size-limit.json
@@ -1,6 +1,6 @@
[
{
"path": "./lib/index.js",
- "limit": "3.1kB"
+ "limit": "3.2kB"
}
]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2183de8..9c060040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 3.8.6
+
+### Patch Changes
+
+- [#374](https://github.com/import-js/eslint-import-resolver-typescript/pull/374) [`c9d5ab0`](https://github.com/import-js/eslint-import-resolver-typescript/commit/c9d5ab0fa963bd891b6f2ae312ae3ec10a397b7c) Thanks [@JounQin](https://github.com/JounQin)! - fix: add support for importing with .js extension as tsx importee
+
## 3.8.5
### Patch Changes
diff --git a/package.json b/package.json
index 86e53743..8d601b85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "eslint-import-resolver-typescript",
- "version": "3.8.5",
+ "version": "3.8.6",
"type": "module",
"description": "This plugin adds `TypeScript` support to `eslint-plugin-import`",
"repository": "git+https://github.com/import-js/eslint-import-resolver-typescript",
diff --git a/src/index.ts b/src/index.ts
index b774b3ce..c5a8822d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -362,18 +362,25 @@ function getMappedPaths(
const isJs = JS_EXT_PATTERN.test(source)
if (isJs) {
const jsExt = path.extname(source)
+ // cjs -> cts, js -> ts, jsx -> tsx, mjs -> mts
const tsExt = jsExt.replace('js', 'ts')
+
const basename = source.replace(JS_EXT_PATTERN, '')
- const mappedPaths = getMappedPaths(basename + tsExt, file)
+ let resolved = getMappedPaths(basename + tsExt, file)
- const resolved =
- mappedPaths.length > 0
- ? mappedPaths
- : getMappedPaths(
- basename + '.d' + (tsExt === '.tsx' ? '.ts' : tsExt),
- file,
- )
+ if (resolved.length === 0 && jsExt === '.js') {
+ // js -> tsx
+ const tsxExt = jsExt.replace('js', 'tsx')
+ resolved = getMappedPaths(basename + tsxExt, file)
+ }
+
+ if (resolved.length === 0) {
+ resolved = getMappedPaths(
+ basename + '.d' + (tsExt === '.tsx' ? '.ts' : tsExt),
+ file,
+ )
+ }
if (resolved.length > 0) {
return resolved
diff --git a/tests/withPaths/index.ts b/tests/withPaths/index.ts
index 594e79d4..696bf409 100644
--- a/tests/withPaths/index.ts
+++ b/tests/withPaths/index.ts
@@ -6,9 +6,13 @@ import './subfolder/tsxImportee'
// import using tsconfig.json path mapping
import 'folder/tsImportee'
+import 'folder/tsImportee.js'
import 'folder/tsxImportee'
+import 'folder/tsxImportee.js'
import 'folder/subfolder/tsImportee'
+import 'folder/subfolder/tsImportee.js'
import 'folder/subfolder/tsxImportee'
+import 'folder/subfolder/tsxImportee.js'
// import module with typings set in package.json
import 'folder/module'
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy