File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -34,16 +34,15 @@ export function createGetModuleFromFilename(
34
34
dir = '.' ;
35
35
}
36
36
37
- let n = dir . lastIndexOf ( '/node_modules' ) ;
37
+ const n = dir . lastIndexOf ( '/node_modules' ) ;
38
38
if ( n > - 1 ) {
39
39
return `${ dir . slice ( n + 14 ) . replace ( / \/ / g, '.' ) } :${ file } ` ;
40
40
}
41
41
42
42
// Let's see if it's a part of the main module
43
43
// 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, '.' ) ;
47
46
48
47
if ( moduleName ) {
49
48
moduleName += ':' ;
Original file line number Diff line number Diff line change 1
1
import { createGetModuleFromFilename } from '../src/module' ;
2
2
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' ) ;
5
5
6
6
describe ( 'createGetModuleFromFilename' , ( ) => {
7
7
test ( 'Windows' , ( ) => {
You can’t perform that action at this time.
0 commit comments