Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 5a287d2

Browse files
fix(ts): dependency to not resolve using tsconfig paths (#30)
1 parent 7dbbf3c commit 5a287d2

File tree

21 files changed

+68
-14
lines changed

21 files changed

+68
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"dependencies": {
3434
"@esbuild-kit/core-utils": "^2.0.0",
35-
"get-tsconfig": "^4.0.0"
35+
"get-tsconfig": "^4.0.5"
3636
},
3737
"devDependencies": {
3838
"@pvtnbr/eslint-config": "^0.22.0",

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/loaders.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ async function tryDirectory(
6868
context: Context,
6969
defaultResolve: resolve,
7070
) {
71-
const appendIndex = specifier.endsWith('/') ? 'index' : `${path.sep}index`;
71+
const appendIndex = specifier.endsWith('/') ? 'index' : '/index';
7272

7373
try {
7474
return await tryExtensions(specifier + appendIndex, context, defaultResolve);
7575
} catch (error: any) {
7676
const { message } = error;
77-
error.message = error.message.replace(`${appendIndex}'`, "'");
77+
error.message = error.message.replace(`${appendIndex.replace('/', path.sep)}'`, "'");
7878
error.stack = error.stack.replace(message, error.message);
7979
throw error;
8080
}
@@ -108,6 +108,7 @@ export const resolve: resolve = async function (
108108
if (
109109
tsconfigPathsMatcher
110110
&& !isPath // bare specifier
111+
&& !context.parentURL?.includes('/node_modules/')
111112
) {
112113
const possiblePaths = tsconfigPathsMatcher(specifier);
113114
for (const possiblePath of possiblePaths) {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'resolve-current-directory';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'should-not-resolve-baseUrl';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'should-not-resolve-paths';

tests/fixtures/package-module/tsconfig/node_modules/resolve-current-directory/lib/file.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/fixtures/package-module/tsconfig/node_modules/resolve-current-directory/lib/index.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/fixtures/package-module/tsconfig/node_modules/resolve-current-directory/package.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/fixtures/package-module/tsconfig/node_modules/should-not-resolve-baseUrl/index.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)