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

Commit

Permalink
fix(ts): dependency to not resolve using tsconfig paths (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
privatenumber authored Jun 23, 2022
1 parent 7dbbf3c commit 5a287d2
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@esbuild-kit/core-utils": "^2.0.0",
"get-tsconfig": "^4.0.0"
"get-tsconfig": "^4.0.5"
},
"devDependencies": {
"@pvtnbr/eslint-config": "^0.22.0",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/loaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ async function tryDirectory(
context: Context,
defaultResolve: resolve,
) {
const appendIndex = specifier.endsWith('/') ? 'index' : `${path.sep}index`;
const appendIndex = specifier.endsWith('/') ? 'index' : '/index';

try {
return await tryExtensions(specifier + appendIndex, context, defaultResolve);
} catch (error: any) {
const { message } = error;
error.message = error.message.replace(`${appendIndex}'`, "'");
error.message = error.message.replace(`${appendIndex.replace('/', path.sep)}'`, "'");
error.stack = error.stack.replace(message, error.message);
throw error;
}
Expand Down Expand Up @@ -108,6 +108,7 @@ export const resolve: resolve = async function (
if (
tsconfigPathsMatcher
&& !isPath // bare specifier
&& !context.parentURL?.includes('/node_modules/')
) {
const possiblePaths = tsconfigPathsMatcher(specifier);
for (const possiblePath of possiblePaths) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'resolve-current-directory';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'should-not-resolve-baseUrl';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'should-not-resolve-paths';

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/fixtures/package-module/tsconfig/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('Should not run');
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default 'resolved';
export default 'resolve-target';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default 'resolved';
export default 'nested-resolve-target';
33 changes: 28 additions & 5 deletions tests/specs/typescript/tsconfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,56 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
expect(nodeProcess.stdout).toBe('div null hello world\nnull null goodbye world');
});

describe('paths', ({ test }) => {
describe('paths', ({ test, describe }) => {
test('resolves baseUrl', async () => {
const nodeProcess = await node.load('./src/base-url.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('resolve-target');
});

test('resolves paths exact match', async () => {
const nodeProcess = await node.load('./src/paths-exact-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('resolve-target');
});

test('resolves paths prefix', async () => {
const nodeProcess = await node.load('./src/paths-prefix-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('nested-resolve-target');
});

test('resolves paths suffix', async () => {
const nodeProcess = await node.load('./src/paths-suffix-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('nested-resolve-target');
});

describe('dependency', ({ test }) => {
test('resolve current directory', async () => {
const nodeProcess = await node.load('./dependency-resolve-current-directory', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});

test('should not resolve baseUrl', async () => {
const nodeProcess = await node.load('./dependency-should-not-resolve-baseUrl', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});

test('should not resolve paths', async () => {
const nodeProcess = await node.load('./dependency-should-not-resolve-paths', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});
});
});
});
Expand Down

0 comments on commit 5a287d2

Please sign in to comment.