Skip to content

Commit 840a307

Browse files
authored
fix(node): Module name resolution (#10144)
1 parent 84791bf commit 840a307

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

packages/node/src/module.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ export function createGetModuleFromFilename(
3434
dir = '.';
3535
}
3636

37-
let n = dir.lastIndexOf('/node_modules');
37+
const n = dir.lastIndexOf('/node_modules');
3838
if (n > -1) {
3939
return `${dir.slice(n + 14).replace(/\//g, '.')}:${file}`;
4040
}
4141

4242
// Let's see if it's a part of the main module
4343
// To be a part of main module, it has to share the same base
44-
n = `${dir}/`.lastIndexOf(normalizedBase, 0);
45-
if (n === 0) {
46-
let moduleName = dir.slice(normalizedBase.length).replace(/\//g, '.');
44+
if (dir.startsWith(normalizedBase)) {
45+
let moduleName = dir.slice(normalizedBase.length + 1).replace(/\//g, '.');
4746

4847
if (moduleName) {
4948
moduleName += ':';

packages/node/test/module.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createGetModuleFromFilename } from '../src/module';
22

3-
const getModuleFromFilenameWindows = createGetModuleFromFilename('C:\\Users\\Tim\\', true);
4-
const getModuleFromFilenamePosix = createGetModuleFromFilename('/Users/Tim/');
3+
const getModuleFromFilenameWindows = createGetModuleFromFilename('C:\\Users\\Tim', true);
4+
const getModuleFromFilenamePosix = createGetModuleFromFilename('/Users/Tim');
55

66
describe('createGetModuleFromFilename', () => {
77
test('Windows', () => {

0 commit comments

Comments
 (0)